jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: consolidate URL usage
......................................................................
Hygiene: consolidate URL usage
Rename new Wikipedia URL constant and replace duplicate string in Prefs.
No functional changes intended.
Change-Id: I794d7e37ed415d2f6d505c255e1f76882fc9dfc2
---
M app/src/main/java/org/wikipedia/Constants.java
M
app/src/main/java/org/wikipedia/createaccount/authmanager/AMCreateAccountTask.java
M app/src/main/java/org/wikipedia/login/authmanager/AMLoginTask.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
4 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Mholloway: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/Constants.java
b/app/src/main/java/org/wikipedia/Constants.java
index 7e5a5f2..4cd40ad 100644
--- a/app/src/main/java/org/wikipedia/Constants.java
+++ b/app/src/main/java/org/wikipedia/Constants.java
@@ -7,7 +7,7 @@
public static final int RECENT_SEARCHES_FRAGMENT_LOADER_ID = 101;
public static final int USER_OPTION_ROW_FRAGMENT_LOADER_ID = 102;
- public static final String DEFAULT_AUTH_MANAGER_RETURN_URL =
"https://www.wikipedia.org";;
+ public static final String WIKIPEDIA_URL = "https://wikipedia.org/";;
private Constants() { }
}
diff --git
a/app/src/main/java/org/wikipedia/createaccount/authmanager/AMCreateAccountTask.java
b/app/src/main/java/org/wikipedia/createaccount/authmanager/AMCreateAccountTask.java
index 5c82981..4928dcc 100644
---
a/app/src/main/java/org/wikipedia/createaccount/authmanager/AMCreateAccountTask.java
+++
b/app/src/main/java/org/wikipedia/createaccount/authmanager/AMCreateAccountTask.java
@@ -51,7 +51,7 @@
.param("password", password)
.param("retype", repeatPassword)
.param("createtoken", token)
- .param("createreturnurl",
Constants.DEFAULT_AUTH_MANAGER_RETURN_URL);
+ .param("createreturnurl", Constants.WIKIPEDIA_URL);
if (email != null) {
builder.param("email", email);
}
diff --git a/app/src/main/java/org/wikipedia/login/authmanager/AMLoginTask.java
b/app/src/main/java/org/wikipedia/login/authmanager/AMLoginTask.java
index 3fcaf47..8a01bdd 100644
--- a/app/src/main/java/org/wikipedia/login/authmanager/AMLoginTask.java
+++ b/app/src/main/java/org/wikipedia/login/authmanager/AMLoginTask.java
@@ -44,7 +44,7 @@
.param("username", username)
.param("password", password)
.param("logintoken", token)
- .param("loginreturnurl",
Constants.DEFAULT_AUTH_MANAGER_RETURN_URL);
+ .param("loginreturnurl", Constants.WIKIPEDIA_URL);
}
@Override
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 6e6296a..794c9b1 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -4,6 +4,7 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import org.wikipedia.Constants;
import org.wikipedia.R;
import org.wikipedia.SharedPreferenceCookieManager;
import org.wikipedia.WikipediaApp;
@@ -237,8 +238,7 @@
public static int getSessionTimeout() {
// return the timeout, but don't let it be less than the minimum
- return Math.max(getInt(R.string.preference_key_session_timeout,
- SessionFunnel.DEFAULT_SESSION_TIMEOUT),
SessionFunnel.MIN_SESSION_TIMEOUT);
+ return Math.max(getInt(R.string.preference_key_session_timeout,
SessionFunnel.DEFAULT_SESSION_TIMEOUT), SessionFunnel.MIN_SESSION_TIMEOUT);
}
public static int getTextSizeMultiplier() {
@@ -308,7 +308,7 @@
@NonNull
public static Uri getMediaWikiBaseUri() {
return
Uri.parse(StringUtil.defaultIfBlank(getString(R.string.preference_key_mediawiki_base_uri,
null),
- "https://wikipedia.org/";));
+ Constants.WIKIPEDIA_URL));
}
public static boolean getMediaWikiBaseUriSupportsLangCode() {
--
To view, visit https://gerrit.wikimedia.org/r/288056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I794d7e37ed415d2f6d505c255e1f76882fc9dfc2
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
