Yuvipanda has submitted this change and it was merged.
Change subject: Hit the API on an mdot subdomain instead of a desktop subdomain.
......................................................................
Hit the API on an mdot subdomain instead of a desktop subdomain.
* Wikipedia Zero extension API eligibility check is on mdot for foreseeable
future.
* API behavior generally the same otherwise, so mdot is okay instead of desktop
URL.
* Other aspects of the system still use the originally provided desktop domain.
Change-Id: Ic35ebe02c1abfa11059b52b6cddf94a00f09727f
---
M wikipedia/src/main/java/org/wikipedia/Site.java
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/wikipedia/src/main/java/org/wikipedia/Site.java
b/wikipedia/src/main/java/org/wikipedia/Site.java
index fe2ab0b..dbe8a14 100644
--- a/wikipedia/src/main/java/org/wikipedia/Site.java
+++ b/wikipedia/src/main/java/org/wikipedia/Site.java
@@ -14,11 +14,11 @@
private final String domain;
public Site(String domain) {
- this.domain = normalizeDomainName(domain);
+ this.domain = domain;
}
- protected String normalizeDomainName(String domain) {
- return domain.replace(".m.", ".");
+ protected String getApiDomain() {
+ return domain.replaceFirst("\\.", ".m.");
}
public Site(Parcel in) {
diff --git a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
index 3d427a0..6c7b4a1 100644
--- a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
@@ -79,7 +79,7 @@
private HashMap<String, Api> apis = new HashMap<String, Api>();
public Api getAPIForSite(Site site) {
if (!apis.containsKey(site.getDomain())) {
- apis.put(site.getDomain(), new Api(site.getDomain()));
+ apis.put(site.getDomain(), new Api(site.getApiDomain()));
}
return apis.get(site.getDomain());
}
--
To view, visit https://gerrit.wikimedia.org/r/108087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic35ebe02c1abfa11059b52b6cddf94a00f09727f
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt <ab...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
