Merge branch 'master' into dependency-injection

Author: psh

app/build.gradle

@@ -84,6 +84,29 @@ android {
         }
     }
 
+    productFlavors {
+        prod {
+            buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\""
+            buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""
+            buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.wikimedia.org/wikipedia/commons\""
+            buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.org/wiki/\""
+            buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.org/wiki/\""
+            buildConfigField "String", "EVENTLOG_URL", "\"https://www.wikimedia.org/beacon/event\""
+            buildConfigField "String", "EVENTLOG_WIKI", "\"commonswiki\""
+        }
+
+        beta {
+            // What values do we need to hit the BETA versions of the site / api ?
+            buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.beta.wmflabs.org/w/api.php\""
+            buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""
+            buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.beta.wmflabs.org/wikipedia/commons\""
+            buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/\""
+            buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/wiki/\""
+            buildConfigField "String", "EVENTLOG_URL", "\"https://commons.wikimedia.beta.wmflabs.org/beacon/event\""
+            buildConfigField "String", "EVENTLOG_WIKI", "\"commonswiki\""
+        }
+    }
+
     lintOptions {
         disable 'MissingTranslation'
         disable 'ExtraTranslation'

app/src/androidTest/java/fr/free/nrw/commons/MediaTest.java

@@ -49,13 +49,6 @@ public class CommonsApplication extends DaggerApplication {
     @Inject SessionManager sessionManager;
     @Inject DBOpenHelper dbOpenHelper;
 
-    public static final String API_URL = "https://commons.wikimedia.org/w/api.php";
-    public static final String IMAGE_URL_BASE = "https://upload.wikimedia.org/wikipedia/commons";
-    public static final String HOME_URL = "https://commons.wikimedia.org/wiki/";
-    public static final String MOBILE_HOME_URL = "https://commons.m.wikimedia.org/wiki/";
-    public static final String EVENTLOG_URL = "https://www.wikimedia.org/beacon/event";
-    public static final String EVENTLOG_WIKI = "commonswiki";
-
     public static final Object[] EVENT_UPLOAD_ATTEMPT = {"MobileAppUploadAttempts", 5334329L};
     public static final Object[] EVENT_LOGIN_ATTEMPT = {"MobileAppLoginAttempts", 5257721L};
     public static final Object[] EVENT_SHARE_ATTEMPT = {"MobileAppShareAttempts", 5346170L};

app/src/androidTest/java/fr/free/nrw/commons/NearbyControllerTest.java

@@ -58,7 +58,7 @@ public String getDisplayText() {
      */
     @NonNull
     public Uri getCanonicalUri() {
-        String uriStr = CommonsApplication.HOME_URL + Uri.encode(getPrefixedText(), ":/");
+        String uriStr = BuildConfig.HOME_URL + Uri.encode(getPrefixedText(), ":/");
         return Uri.parse(uriStr);
     }
 
@@ -71,7 +71,7 @@ public Uri getCanonicalUri() {
      */
     @NonNull
     public Uri getMobileUri() {
-        String uriStr = CommonsApplication.MOBILE_HOME_URL + Uri.encode(getPrefixedText(), ":/");
+        String uriStr = BuildConfig.MOBILE_HOME_URL + Uri.encode(getPrefixedText(), ":/");
         return Uri.parse(uriStr);
     }
 

app/src/androidTest/java/fr/free/nrw/commons/PageTitleTest.java

@@ -11,6 +11,7 @@
 
 import fr.free.nrw.commons.settings.Prefs;
 
+
 public class Utils {
 
     /**
@@ -32,7 +33,7 @@ public static String stripLocalizedString(String s) {
     public static String makeThumbBaseUrl(String filename) {
         String name = new PageTitle(filename).getPrefixedText();
         String sha = new String(Hex.encodeHex(DigestUtils.md5(name)));
-        return String.format("%s/%s/%s/%s", CommonsApplication.IMAGE_URL_BASE, sha.substring(0, 1), sha.substring(0, 2), urlEncode(name));
+        return String.format("%s/%s/%s/%s", BuildConfig.IMAGE_URL_BASE, sha.substring(0, 1), sha.substring(0, 2), urlEncode(name));
     }
 
     public static String urlEncode(String url) {

app/src/betaDebug/res/drawable-hdpi/ic_launcher.png

@@ -6,6 +6,7 @@
 
 import dagger.Module;
 import dagger.Provides;
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.auth.AccountUtil;
 import fr.free.nrw.commons.auth.SessionManager;
@@ -37,7 +38,7 @@ public SessionManager providesSessionManager(MediaWikiApi mediaWikiApi) {
     @Provides
     @Singleton
     public MediaWikiApi provideMediaWikiApi() {
-        return new ApacheHttpClientMediaWikiApi(CommonsApplication.API_URL);
+        return new ApacheHttpClientMediaWikiApi(BuildConfig.WIKIMEDIA_API_HOST);
     }
 
     @Provides

app/src/betaDebug/res/drawable-mdpi/ic_launcher.png

@@ -47,12 +47,12 @@ URL toUrl() {
         try {
             fullData.put("schema", schema);
             fullData.put("revision", rev);
-            fullData.put("wiki", CommonsApplication.EVENTLOG_WIKI);
+            fullData.put("wiki", BuildConfig.EVENTLOG_WIKI);
             data.put("device", EventLog.DEVICE);
             data.put("platform", "Android/" + Build.VERSION.RELEASE);
             data.put("appversion", "Android/" + BuildConfig.VERSION_NAME);
             fullData.put("event", data);
-            return new URL(CommonsApplication.EVENTLOG_URL + "?" + Utils.urlEncode(fullData.toString()) + ";");
+            return new URL(BuildConfig.EVENTLOG_URL + "?" + Utils.urlEncode(fullData.toString()) + ";");
         } catch (MalformedURLException | JSONException e) {
             throw new RuntimeException(e);
         }

app/src/betaDebug/res/drawable-xhdpi/ic_launcher.png

@@ -7,7 +7,7 @@
 import dagger.android.support.DaggerAppCompatActivity;
 import fr.free.nrw.commons.R;
 
-public class BaseActivity extends DaggerAppCompatActivity {
+public abstract class BaseActivity extends DaggerAppCompatActivity {
     boolean currentTheme;
 
     @Override