Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/288052
Change subject: Hygiene: consolidate Site code
......................................................................
Hygiene: consolidate Site code
Very tiny DRY up in Site. No functional changes intended.
Change-Id: I0bc3df50464ae92db68fc34f597c23a3968513c6
---
M app/src/main/java/org/wikipedia/Site.java
M app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
2 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/52/288052/1
diff --git a/app/src/main/java/org/wikipedia/Site.java
b/app/src/main/java/org/wikipedia/Site.java
index 159dc41..449606c 100644
--- a/app/src/main/java/org/wikipedia/Site.java
+++ b/app/src/main/java/org/wikipedia/Site.java
@@ -143,8 +143,7 @@
*/
@NonNull
public String mobileHost() {
- String subdomain = languageCodeToSubdomain(languageCode);
- return host().replaceFirst("^" + subdomain + "\\.?", "$0m.");
+ return authorityToMobile(host());
}
public int port() {
@@ -271,8 +270,8 @@
return authority.replaceFirst("\\.m\\.", ".");
}
- @NonNull
- private String authorityToMobile(@NonNull String authority) {
+ /** @param authority Host and optional port. */
+ @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/dataclient/retrofit/RetrofitFactory.java
b/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
index d117079..411e68c 100644
--- a/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
+++ b/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
@@ -22,7 +22,7 @@
public final class RetrofitFactory {
public static Retrofit newInstance(@NonNull Site site) {
- return newInstance(site, site.scheme() + "://" + site.authority() +
"/");
+ return newInstance(site, site.url(""));
}
public static Retrofit newInstance(@NonNull final Site site, @NonNull
String endpoint) {
@@ -68,4 +68,4 @@
}
private RetrofitFactory() { }
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/288052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bc3df50464ae92db68fc34f597c23a3968513c6
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
