jenkins-bot has submitted this change and it was merged.
Change subject: Make getMobileUri() return the mobile URI
......................................................................
Make getMobileUri() return the mobile URI
Sometimes we actually want the mobile URI, for instance when sending to
a browser to view externally. So this updages getMobileUri() to return
it rather than duplicate getCanonicalUri().
Bug: T129266
Change-Id: I8d306301d29fb42bd4d18e135254160245cc9f7f
---
M app/src/main/java/org/wikipedia/Site.java
M app/src/main/java/org/wikipedia/page/PageTitle.java
2 files changed, 12 insertions(+), 1 deletion(-)
Approvals:
Niedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/Site.java
b/app/src/main/java/org/wikipedia/Site.java
index 2a372a0..159dc41 100644
--- a/app/src/main/java/org/wikipedia/Site.java
+++ b/app/src/main/java/org/wikipedia/Site.java
@@ -117,6 +117,11 @@
}
@NonNull
+ public String mobileAuthority() {
+ return authorityToMobile(authority());
+ }
+
+ @NonNull
public String host() {
return uri.getHost();
}
@@ -265,4 +270,10 @@
private static String authorityToDesktop(@NonNull String authority) {
return authority.replaceFirst("\\.m\\.", ".");
}
+
+ @NonNull
+ private String authorityToMobile(@NonNull String authority) {
+ String subdomain = languageCodeToSubdomain(languageCode);
+ return authority.replaceFirst("^" + subdomain + "\\.?", "$0m.");
+ }
}
diff --git a/app/src/main/java/org/wikipedia/page/PageTitle.java
b/app/src/main/java/org/wikipedia/page/PageTitle.java
index e58d703..74f8fc1 100644
--- a/app/src/main/java/org/wikipedia/page/PageTitle.java
+++ b/app/src/main/java/org/wikipedia/page/PageTitle.java
@@ -236,7 +236,7 @@
}
public String getMobileUri() {
- return getUriForDomain(getSite().authority());
+ return getUriForDomain(getSite().mobileAuthority());
}
public String getUriForAction(String action) {
--
To view, visit https://gerrit.wikimedia.org/r/281517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8d306301d29fb42bd4d18e135254160245cc9f7f
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[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
