jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: move URL scheme from WikipediaApp to Site
......................................................................
Hygiene: move URL scheme from WikipediaApp to Site
Move WikipediaApp.getNetworkProtocol() to Site.scheme(). Since
getNetworkProtocol() always returned "https" and Site.secureScheme is
always true, this change should have no effect.
Change-Id: Ie26251537dfca08fa881d2b16170e1b5dbbacdc9
---
M app/src/androidTest/java/org/wikipedia/test/CreateAccountTaskTest.java
M app/src/androidTest/java/org/wikipedia/test/EditTaskTest.java
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/dataclient/RestAdapterFactory.java
M app/src/main/java/org/wikipedia/page/LinkHandler.java
M app/src/main/java/org/wikipedia/page/PageTitle.java
M app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M app/src/main/java/org/wikipedia/server/restbase/RbPageEndpointsCache.java
M app/src/main/java/org/wikipedia/util/UriUtil.java
10 files changed, 14 insertions(+), 24 deletions(-)
Approvals:
Mholloway: Looks good to me, but someone else must approve
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/androidTest/java/org/wikipedia/test/CreateAccountTaskTest.java
b/app/src/androidTest/java/org/wikipedia/test/CreateAccountTaskTest.java
index c3dcf45..5b54ae7 100644
--- a/app/src/androidTest/java/org/wikipedia/test/CreateAccountTaskTest.java
+++ b/app/src/androidTest/java/org/wikipedia/test/CreateAccountTaskTest.java
@@ -42,7 +42,7 @@
assertThat(captchaResult, notNullValue());
assertThat(captchaResult.getCaptchaId(),
not(isEmptyOrNullString()));
- String expectedCaptchaUrlPrefix =
WikipediaApp.getInstance().getNetworkProtocol()
+ String expectedCaptchaUrlPrefix =
WikipediaApp.getInstance().getSite().scheme()
+
"://test.wikipedia.org/w/index.php?title=Special:Captcha/image";
assertThat(captchaResult.getCaptchaUrl(testWiki),
startsWith(expectedCaptchaUrlPrefix));
}
@@ -68,4 +68,4 @@
return result;
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/androidTest/java/org/wikipedia/test/EditTaskTest.java
b/app/src/androidTest/java/org/wikipedia/test/EditTaskTest.java
index 3f8cb36..c9a760f 100644
--- a/app/src/androidTest/java/org/wikipedia/test/EditTaskTest.java
+++ b/app/src/androidTest/java/org/wikipedia/test/EditTaskTest.java
@@ -131,7 +131,7 @@
}
private String getNetworkProtocol() {
- return app().getNetworkProtocol();
+ return app().getSite().scheme();
}
private WikipediaApp app() {
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 024d8fd..4f350fe 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -65,17 +65,11 @@
import static org.wikipedia.util.StringUtil.emptyIfNull;
public class WikipediaApp extends Application {
- private static final String HTTPS_PROTOCOL = "https";
private static final int EVENT_LOG_TESTING_ID = new
Random().nextInt(Integer.MAX_VALUE);
private float screenDensity;
public float getScreenDensity() {
return screenDensity;
- }
-
- // Reload in onCreate to override
- public String getNetworkProtocol() {
- return HTTPS_PROTOCOL;
}
public static final int FONT_SIZE_MULTIPLIER_MIN = -5;
diff --git a/app/src/main/java/org/wikipedia/dataclient/RestAdapterFactory.java
b/app/src/main/java/org/wikipedia/dataclient/RestAdapterFactory.java
index 8d2726d..ed90207 100644
--- a/app/src/main/java/org/wikipedia/dataclient/RestAdapterFactory.java
+++ b/app/src/main/java/org/wikipedia/dataclient/RestAdapterFactory.java
@@ -16,8 +16,7 @@
public final class RestAdapterFactory {
public static RestAdapter newInstance(@NonNull Site site) {
- return newInstance(site,
- WikipediaApp.getInstance().getNetworkProtocol() + "://" +
site.host());
+ return newInstance(site, site.scheme() + "://" + site.host());
}
public static RestAdapter newInstance(@NonNull final Site site, @NonNull
String endpoint) {
diff --git a/app/src/main/java/org/wikipedia/page/LinkHandler.java
b/app/src/main/java/org/wikipedia/page/LinkHandler.java
index 8b088e3..5333dfd 100644
--- a/app/src/main/java/org/wikipedia/page/LinkHandler.java
+++ b/app/src/main/java/org/wikipedia/page/LinkHandler.java
@@ -3,10 +3,10 @@
import android.content.Context;
import android.net.Uri;
import android.util.Log;
+
import org.json.JSONException;
import org.json.JSONObject;
import org.wikipedia.Site;
-import org.wikipedia.WikipediaApp;
import org.wikipedia.bridge.CommunicationBridge;
import static org.wikipedia.util.UriUtil.decodeURL;
@@ -69,7 +69,7 @@
} else {
// if it's a /w/ URI, turn it into a full URI and go external
if (href.startsWith("/w/")) {
- href = String.format("%1$s://%2$s",
WikipediaApp.getInstance().getNetworkProtocol(), getSite().host()) + href;
+ href = String.format("%1$s://%2$s", getSite().scheme(),
getSite().host()) + href;
}
handleExternalLink(context, Uri.parse(href));
}
diff --git a/app/src/main/java/org/wikipedia/page/PageTitle.java
b/app/src/main/java/org/wikipedia/page/PageTitle.java
index 1e05a71..fc0cf3e 100644
--- a/app/src/main/java/org/wikipedia/page/PageTitle.java
+++ b/app/src/main/java/org/wikipedia/page/PageTitle.java
@@ -4,10 +4,10 @@
import android.os.Parcelable;
import android.support.annotation.Nullable;
import android.text.TextUtils;
+
import org.json.JSONException;
import org.json.JSONObject;
import org.wikipedia.Site;
-import org.wikipedia.WikipediaApp;
import org.wikipedia.staticdata.FileAliasData;
import org.wikipedia.staticdata.MainPageNameData;
import org.wikipedia.staticdata.SpecialAliasData;
@@ -209,7 +209,7 @@
try {
return String.format(
"%1$s://%2$s/wiki/%3$s%4$s",
- WikipediaApp.getInstance().getNetworkProtocol(),
+ getSite().scheme(),
domain,
URLEncoder.encode(getPrefixedText(), "utf-8"),
(this.fragment != null && this.fragment.length() > 0) ?
("#" + this.fragment) : ""
@@ -231,7 +231,7 @@
try {
return String.format(
"%1$s://%2$s/w/index.php?title=%3$s&action=%4$s",
- WikipediaApp.getInstance().getNetworkProtocol(),
+ getSite().scheme(),
getSite().host(),
URLEncoder.encode(getPrefixedText(), "utf-8"),
action
diff --git a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
index 63e83cc..2ec5f66 100644
--- a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
+++ b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
@@ -355,7 +355,7 @@
} else {
// if it's a /w/ URI, turn it into a full URI and go
external
if (url.startsWith("/w/")) {
- url = String.format("%1$s://%2$s",
WikipediaApp.getInstance().getNetworkProtocol(), site.host()) + url;
+ url = String.format("%1$s://%2$s", site.scheme(),
site.host()) + url;
}
handleExternalLink(GalleryActivity.this, Uri.parse(url));
}
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
index 2838fc4..d634acf 100755
--- a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -254,7 +254,7 @@
*/
private void loadLeadImage(@Nullable String url) {
if (!isMainPage() && !TextUtils.isEmpty(url) && isLeadImageEnabled()) {
- String fullUrl = WikipediaApp.getInstance().getNetworkProtocol() +
":" + url;
+ String fullUrl = getTitle().getSite().scheme() + ":" + url;
articleHeaderView.setImageYScalar(0);
articleHeaderView.loadImage(fullUrl);
} else {
diff --git
a/app/src/main/java/org/wikipedia/server/restbase/RbPageEndpointsCache.java
b/app/src/main/java/org/wikipedia/server/restbase/RbPageEndpointsCache.java
index ecaf3ef..3c15364 100644
--- a/app/src/main/java/org/wikipedia/server/restbase/RbPageEndpointsCache.java
+++ b/app/src/main/java/org/wikipedia/server/restbase/RbPageEndpointsCache.java
@@ -1,7 +1,6 @@
package org.wikipedia.server.restbase;
import org.wikipedia.Site;
-import org.wikipedia.WikipediaApp;
import org.wikipedia.dataclient.RestAdapterFactory;
import org.wikipedia.settings.Prefs;
@@ -29,10 +28,8 @@
}
private RbPageService.RbEndpoints createRbService(Site site) {
- RbPageService.RbEndpoints webService =
RestAdapterFactory.newInstance(site,
- String.format(Locale.ROOT, Prefs.getRestbaseUriFormat(),
- WikipediaApp.getInstance().getNetworkProtocol(),
site.host()))
+ return RestAdapterFactory.newInstance(site,
+ String.format(Locale.ROOT, Prefs.getRestbaseUriFormat(),
site.scheme(), site.host()))
.create(RbPageService.RbEndpoints.class);
- return webService;
}
}
diff --git a/app/src/main/java/org/wikipedia/util/UriUtil.java
b/app/src/main/java/org/wikipedia/util/UriUtil.java
index 9d5ee88..bca5ad7 100644
--- a/app/src/main/java/org/wikipedia/util/UriUtil.java
+++ b/app/src/main/java/org/wikipedia/util/UriUtil.java
@@ -65,7 +65,7 @@
* @return A fully qualified, protocol specified URL
*/
public static String resolveProtocolRelativeUrl(String url) {
- return (url.startsWith("//") ?
WikipediaApp.getInstance().getNetworkProtocol() + ":" + url
+ return (url.startsWith("//") ?
WikipediaApp.getInstance().getSite().scheme() + ":" + url
: url);
}
--
To view, visit https://gerrit.wikimedia.org/r/273404
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie26251537dfca08fa881d2b16170e1b5dbbacdc9
Gerrit-PatchSet: 4
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
