Only enable the Updater code on github releases to close mozilla#933

Waldgeister · Oct 27, 2014 · 8f9d27a · 8f9d27a
1 parent f6d4836
commit 8f9d27a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -10,9 +10,13 @@ unittest:
 debug:
 	./gradlew assembleDebug
 
-release: release_check
-	./gradlew assembleRelease
-	sh rename_release.sh
+github: release_check
+	./gradlew assembleGithub
+	sh rename_release.sh github
+
+playstore: release_check
+	./gradlew assemblePlaystore
+	sh rename_release.sh playstore
 
 clean:
 	rm -rf android/libs/*.jar

diff --git a/android/build.gradle b/android/build.gradle
@@ -65,6 +65,9 @@ android {
 
         buildConfigField "boolean", "LABEL_MAP_TILES", "false"
 
+        buildConfigField "boolean", "GITHUB", "false"
+        buildConfigField "boolean", "PLAYSTORE", "false"
+
         // Crash report settings
         buildConfigField "String", "ACRA_URI", getAcraURI()
         buildConfigField "String", "ACRA_USER", getAcraUser()
@@ -92,6 +95,16 @@ android {
             signingConfig signingConfigs.release
         }
 
+        github.initWith(buildTypes.release)
+        github {
+            buildConfigField "boolean", "GITHUB", "true"
+        }
+
+        playstore.initWith(buildTypes.release)
+        playstore {
+            buildConfigField "boolean", "PLAYSTORE", "true"
+        }
+
         unittest.initWith(buildTypes.debug)
         unittest {
             buildConfigField "boolean", "ROBOLECTRIC", "true"

diff --git a/android/src/main/java/org/mozilla/mozstumbler/client/navdrawer/MainDrawerActivity.java b/android/src/main/java/org/mozilla/mozstumbler/client/navdrawer/MainDrawerActivity.java
@@ -107,8 +107,10 @@ public void onDrawerOpened(View drawerView) {
         getApp().setMainActivity(this);
 
         IHttpUtil httpUtil = new HttpUtil();
-        Updater upd = new Updater(httpUtil);
-        upd.checkForUpdates(this, BuildConfig.MOZILLA_API_KEY);
+        if (BuildConfig.GITHUB) {
+            Updater upd = new Updater(httpUtil);
+            upd.checkForUpdates(this, BuildConfig.MOZILLA_API_KEY);
+        }
 
         mMetricsView = new MetricsView(findViewById(R.id.left_drawer));
     }

diff --git a/rename_release.sh b/rename_release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 # bad hack to rename the final apk
 mkdir -p outputs
-cmd="cp android/build/outputs/apk/MozStumbler-release.apk outputs/MozStumbler-v`cat VERSION`.apk"
+cmd="cp android/build/outputs/apk/MozStumbler-$1.apk outputs/MozStumbler-v`cat VERSION`.apk"
 `${cmd}`