Skip to content

Commit 35a2fe8

Browse files
authored
Use variant-dependent variable to make URLs for vanishing (commons-app#6117)
1 parent 9f1fe87 commit 35a2fe8

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

app/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ android {
314314
buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.org\""
315315
buildConfigField "String", "WIKIDATA_URL", "\"https://www.wikidata.org\""
316316
buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.org/wiki/\""
317+
buildConfigField "String", "MOBILE_META_URL", "\"https://meta.m.wikimedia.org/wiki/\""
317318
buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
318319
buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Main_Page&welcome=yes\""
319320
buildConfigField "String", "FORGOT_PASSWORD_URL", "\"https://commons.wikimedia.org/wiki/Special:PasswordReset\""
@@ -350,6 +351,7 @@ android {
350351
buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.beta.wmflabs.org\""
351352
buildConfigField "String", "WIKIDATA_URL", "\"https://www.wikidata.org\""
352353
buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/wiki/\""
354+
buildConfigField "String", "MOBILE_META_URL", "\"https://meta.m.wikimedia.beta.wmflabs.org/wiki/\""
353355
buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
354356
buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Main_Page&welcome=yes\""
355357
buildConfigField "String", "FORGOT_PASSWORD_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/Special:PasswordReset\""

app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import com.karumi.dexter.MultiplePermissionsReport
3333
import com.karumi.dexter.PermissionToken
3434
import com.karumi.dexter.listener.PermissionRequest
3535
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
36+
import fr.free.nrw.commons.BuildConfig.MOBILE_META_URL
3637
import fr.free.nrw.commons.R
3738
import fr.free.nrw.commons.Utils
3839
import fr.free.nrw.commons.activity.SingleWebViewActivity
@@ -511,8 +512,10 @@ class SettingsFragment : PreferenceFragmentCompat() {
511512

512513
@Suppress("LongLine")
513514
companion object {
514-
private const val VANISH_ACCOUNT_URL = "https://meta.m.wikimedia.org/wiki/Special:Contact/accountvanishapps"
515-
private const val VANISH_ACCOUNT_SUCCESS_URL = "https://meta.m.wikimedia.org/wiki/Special:GlobalVanishRequest/vanished"
515+
// TODO: consider changing these to MOBILE_HOME_URL after the following task is resolved:
516+
// https://phabricator.wikimedia.org/T380527
517+
private const val VANISH_ACCOUNT_URL = MOBILE_META_URL + "Special:GlobalVanishRequest"
518+
private const val VANISH_ACCOUNT_SUCCESS_URL = MOBILE_META_URL + "Special:GlobalVanishRequest/vanished"
516519
/**
517520
* Create Locale based on different types of language codes
518521
* @param languageCode

0 commit comments

Comments
 (0)