Merge pull request #344 from cpeterso/cpeterso/only-update-mozilla-bu…

…ilds Only Mozilla builds should try to download updated Mozilla builds
mozilla · Jan 25, 2014 · 51dfd8c · 51dfd8c
2 parents bb86f1a + 728ea3a
commit 51dfd8c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 26 deletions.
diff --git a/build.gradle b/build.gradle
@@ -38,7 +38,7 @@ android {
     }
 
     signingConfigs {
-      release
+        release
     }
 
     buildTypes {
@@ -47,7 +47,6 @@ android {
         }
 
         release {
-            debuggable true
             runProguard true
             proguardFile 'proguard.cfg'
             signingConfig signingConfigs.release
@@ -74,15 +73,14 @@ if (hasProperty('StoreFile')) {
 }
 
 String getMozillaApiKey() {
-    return project.hasProperty('MozAPIKey') ? '"' +  project['MozAPIKey'] + '"' : "\"test\"";
+    return project.hasProperty('MozAPIKey') ? '"' +  project['MozAPIKey'] + '"' : "null";
 }
 
 String getTileServerUrl() {
     if (project.hasProperty('TileServerURL')) {
         return '"' + project['TileServerURL'] + '"';
     } else if (project.hasProperty('MapAPIKey')) {
         return "\"http://api.tiles.mapbox.com/v3/${project['MapAPIKey']}/\"";
-    } else {
-        return "null";
     }
+    return "null";
 }
diff --git a/src/org/mozilla/mozstumbler/MainActivity.java b/src/org/mozilla/mozstumbler/MainActivity.java
@@ -116,7 +116,10 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         new Prefs(this).setDefaultValues();
-        Updater.checkForUpdates(this);
+
+        if (BuildConfig.MOZILLA_API_KEY != null) {
+            Updater.checkForUpdates(this);
+        }
 
         Log.d(LOGTAG, "onCreate");
     }

diff --git a/src/org/mozilla/mozstumbler/MapActivity.java b/src/org/mozilla/mozstumbler/MapActivity.java
@@ -85,7 +85,6 @@ public void onReceive(Context context, Intent intent) {
         }
     }
 
-    @SuppressWarnings("ConstantConditions")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -94,20 +93,8 @@ protected void onCreate(Bundle savedInstanceState) {
         mWifiData = Collections.emptyList();
         MOZSTUMBLER_USER_AGENT_STRING = NetworkUtils.getUserAgentString(this);
 
-        OnlineTileSourceBase tileSource;
-        if (BuildConfig.TILE_SERVER_URL == null) {
-            tileSource = TileSourceFactory.DEFAULT_TILE_SOURCE;
-        } else {
-            tileSource = new XYTileSource("MozStumbler Tile Store",
-                                          null,
-                                          1, 20, 256,
-                                          ".png",
-                                          BuildConfig.TILE_SERVER_URL);
-        }
-
         mMap = (MapView) this.findViewById(R.id.map);
-
-        mMap.setTileSource(tileSource);
+        mMap.setTileSource(getTileSource());
         mMap.setBuiltInZoomControls(true);
         mMap.setMultiTouchControls(true);
 
@@ -120,6 +107,18 @@ protected void onCreate(Bundle savedInstanceState) {
         Log.d(LOGTAG, "onCreate");
     }
 
+    @SuppressWarnings("ConstantConditions")
+    private static OnlineTileSourceBase getTileSource() {
+        if (BuildConfig.TILE_SERVER_URL == null) {
+            return TileSourceFactory.DEFAULT_TILE_SOURCE;
+        }
+        return new XYTileSource("MozStumbler Tile Store",
+                                null,
+                                1, 20, 256,
+                                ".png",
+                                BuildConfig.TILE_SERVER_URL);
+    }
+
     private static class AccuracyCircleOverlay extends SafeDrawOverlay {
         private GeoPoint mPoint;
         private float mAccuracy;
@@ -180,12 +179,6 @@ protected void onStart() {
     protected void onStop() {
         super.onStop();
 
-        Context context = getApplicationContext();
-        Intent i = new Intent(ScannerService.MESSAGE_TOPIC);
-        i.putExtra(Intent.EXTRA_SUBJECT, "Scanner");
-        i.putExtra("enable", 0);
-        context.sendBroadcast(i);
-
         Log.d(LOGTAG, "onStop");
         mMap.getTileProvider().clearTileCache();
         if (mReceiver != null) {