From ca4b99a1cc2b7401081d8e2fe948021e0078c168 Mon Sep 17 00:00:00 2001
From: Paul Hawke <paul.hawke@gmail.com>
Date: Sat, 26 Aug 2017 15:42:44 -0500
Subject: [PATCH] Product flavors to allow switching between the production and
 the beta-cluster Wikimedia servers.

---
 app/build.gradle                              |  23 ++++++++++++++++++
 .../res/drawable-hdpi/ic_launcher.png         | Bin 0 -> 4358 bytes
 .../res/drawable-mdpi/ic_launcher.png         | Bin 0 -> 3019 bytes
 .../res/drawable-xhdpi/ic_launcher.png        | Bin 0 -> 5649 bytes
 .../free/nrw/commons/CommonsApplication.java  |   8 +-----
 .../java/fr/free/nrw/commons/PageTitle.java   |   4 +--
 .../main/java/fr/free/nrw/commons/Utils.java  |  11 +++++----
 .../fr/free/nrw/commons/mwapi/LogBuilder.java |   4 +--
 8 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 app/src/betaDebug/res/drawable-hdpi/ic_launcher.png
 create mode 100644 app/src/betaDebug/res/drawable-mdpi/ic_launcher.png
 create mode 100644 app/src/betaDebug/res/drawable-xhdpi/ic_launcher.png

diff --git a/app/build.gradle b/app/build.gradle
index 51d6f56b0..4358c4699 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,6 +77,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'
diff --git a/app/src/betaDebug/res/drawable-hdpi/ic_launcher.png b/app/src/betaDebug/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..46c0a42022eac5465a5e405a44af210c567ad32a
GIT binary patch
literal 4358
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
AO8@`>

literal 0
HcmV?d00001

diff --git a/app/src/betaDebug/res/drawable-mdpi/ic_launcher.png b/app/src/betaDebug/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e549967676e6081ad621be139ee59b540acbc4e
GIT binary patch
literal 3019
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
N002ovPDHLkV1jl@)<*yU

literal 0
HcmV?d00001

diff --git a/app/src/betaDebug/res/drawable-xhdpi/ic_launcher.png b/app/src/betaDebug/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f0c702ed6bd8624ad553789ae921622a24d9cbc
GIT binary patch
literal 5649
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

literal 0
HcmV?d00001

diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
index b7b75fae5..f4ce71dc3 100644
--- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
+++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -47,12 +47,6 @@ import timber.log.Timber;
 public class CommonsApplication extends Application {
 
     private Account currentAccount = null; // Unlike a savings account...
-    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};
@@ -88,7 +82,7 @@ public class CommonsApplication extends Application {
 
     public MediaWikiApi getMWApi() {
         if (api == null) {
-            api = new ApacheHttpClientMediaWikiApi(API_URL);
+            api = new ApacheHttpClientMediaWikiApi(BuildConfig.WIKIMEDIA_API_HOST);
         }
         return api;
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/PageTitle.java b/app/src/main/java/fr/free/nrw/commons/PageTitle.java
index eb8a61284..6229e7ef9 100644
--- a/app/src/main/java/fr/free/nrw/commons/PageTitle.java
+++ b/app/src/main/java/fr/free/nrw/commons/PageTitle.java
@@ -58,7 +58,7 @@ public class PageTitle {
      */
     @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 class PageTitle {
      */
     @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);
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java
index 7e75f8718..ebebd4891 100644
--- a/app/src/main/java/fr/free/nrw/commons/Utils.java
+++ b/app/src/main/java/fr/free/nrw/commons/Utils.java
@@ -40,7 +40,6 @@ import javax.xml.transform.stream.StreamResult;
 import fr.free.nrw.commons.settings.Prefs;
 import timber.log.Timber;
 
-
 public class Utils {
 
     // Get SHA1 of file from input stream
@@ -80,10 +79,12 @@ public class Utils {
         }
     }
 
-    /** Fix Html.fromHtml is deprecated problem
+    /**
+     * Fix Html.fromHtml is deprecated problem
+     *
      * @param source provided Html string
      * @return returned Spanned of appropriate method according to version check
-     * */
+     */
     public static Spanned fromHtml(String source) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             return Html.fromHtml(source, Html.FROM_HTML_MODE_LEGACY);
@@ -127,7 +128,7 @@ public class Utils {
     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 getStringFromDOM(Node dom) {
@@ -277,6 +278,6 @@ public class Utils {
     }
 
     public static boolean isDarkTheme(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("theme",false);
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("theme", false);
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/LogBuilder.java b/app/src/main/java/fr/free/nrw/commons/mwapi/LogBuilder.java
index b512f9647..eabbbf82e 100644
--- a/app/src/main/java/fr/free/nrw/commons/mwapi/LogBuilder.java
+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/LogBuilder.java
@@ -41,12 +41,12 @@ public class LogBuilder {
         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);
         }