jenkins-bot has submitted this change and it was merged.
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, 20 insertions(+), 15 deletions(-)
Approvals:
Dbrant: 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 159dc41..d130a37 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() {
@@ -160,10 +159,17 @@
}
/**
- * @return The canonical URL for segment.
+ * @return The canonical URL. e.g., https://en.wikipedia.org.
+ */
+ public String url() {
+ return scheme() + "://" + authority();
+ }
+
+ /**
+ * @return The canonical URL for segment. e.g.,
https://en.wikipedia.org/w/foo.
*/
public String url(@NonNull String segment) {
- return scheme() + "://" + authority() + path(segment);
+ return url() + path(segment);
}
/**
@@ -271,8 +277,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..22be5b9 100644
--- a/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
+++ b/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
@@ -1,12 +1,16 @@
package org.wikipedia.dataclient.retrofit;
+import android.support.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.server.Protection;
import org.wikipedia.settings.Prefs;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import java.io.IOException;
import okhttp3.Interceptor;
import okhttp3.OkHttpClient;
@@ -16,18 +20,13 @@
import retrofit2.Retrofit;
import retrofit2.converter.gson.GsonConverterFactory;
-import android.support.annotation.NonNull;
-
-import java.io.IOException;
-
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) {
final WikipediaApp app = WikipediaApp.getInstance();
-
HttpLoggingInterceptor loggingInterceptor = new
HttpLoggingInterceptor();
loggingInterceptor.setLevel(Prefs.getRetrofitLogLevel());
@@ -68,4 +67,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: merged
Gerrit-Change-Id: I0bc3df50464ae92db68fc34f597c23a3968513c6
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
