Removed magic number infection

Author: garvankeeley

Diff for: android/src/main/java/org/mozilla/mozstumbler/client/mapview/MapActivity.java

@@ -90,7 +90,8 @@ public enum NoMapAvailableMessage { eHideNoMapMessage, eNoMapDueToNoAccessibleSt
     // Used to blank the high-res tile source when adding a low-res overlay
     private class BlankTileSource extends OnlineTileSourceBase {
         BlankTileSource() {
-            super("fake", ResourceProxy.string.mapquest_aerial /* arbitrary value */, 13,
+            super("fake", ResourceProxy.string.mapquest_aerial /* arbitrary value */,
+                    AbstractMapOverlay.MIN_ZOOM_LEVEL_OF_MAP,
                     AbstractMapOverlay.MAX_ZOOM_LEVEL_OF_MAP, AbstractMapOverlay.TILE_PIXEL_SIZE,
                     "", new String[] {""});
         }
@@ -168,7 +169,7 @@ public void run() {
         final int zoom = zoomLevel;
         mMap.getController().setZoom(zoom);
         mMap.getController().setCenter(loc);
-        mMap.setMinZoomLevel(13);
+        mMap.setMinZoomLevel(AbstractMapOverlay.MIN_ZOOM_LEVEL_OF_MAP);
 
         mMap.post(new Runnable() {
             @Override
@@ -320,18 +321,18 @@ private void mapNetworkConnectionChanged() {
 
         mMap.post(mCoverageUrlQuery);
 
-        ConnectivityManager cm = (ConnectivityManager) getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
-        boolean hasNetwork = cm.getActiveNetworkInfo() != null && cm.getActiveNetworkInfo().isConnectedOrConnecting();
+        final ConnectivityManager cm = (ConnectivityManager) getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
+        final NetworkInfo info = cm.getActiveNetworkInfo();
+        final boolean hasNetwork = (info != null) && cm.getActiveNetworkInfo().isConnected();
+        final boolean hasWifi = (info != null) && (info.getType() == ConnectivityManager.TYPE_WIFI);
 
         if (!hasNetwork) {
             showMapNotAvailableMessage(NoMapAvailableMessage.eNoMapDueToNoInternet);
             return;
         }
 
         showMapNotAvailableMessage(NoMapAvailableMessage.eHideNoMapMessage);
-
-        NetworkInfo info = cm.getActiveNetworkInfo();
-        setHighBandwidthMap(info.getType() == ConnectivityManager.TYPE_WIFI);
+        setHighBandwidthMap(hasWifi);
     }
 
     private void initNetworkConnectionChangedListener() {

Diff for: android/src/main/java/org/mozilla/mozstumbler/client/mapview/tiles/AbstractMapOverlay.java

@@ -24,6 +24,8 @@
 public abstract class AbstractMapOverlay extends TilesOverlay {
     // We want the map to zoom to level 20, even if tiles have less zoom available
     public static final int MAX_ZOOM_LEVEL_OF_MAP = 20;
+    public static final int MIN_ZOOM_LEVEL_OF_MAP = 13;
+
     public static final int TILE_PIXEL_SIZE = 256;
     // Use png32 which is a 32-color indexed image, the tiles are ~30% smaller
     public static String FILE_TYPE_SUFFIX_PNG = ".png32";

Diff for: android/src/main/java/org/mozilla/mozstumbler/client/mapview/tiles/CoverageOverlay.java

@@ -16,12 +16,12 @@
  * This class provides the Mozilla Coverage overlay
  */
 public class CoverageOverlay extends AbstractMapOverlay {
-
     public CoverageOverlay(final Context aContext, final String coverageUrl, MapView mapView) {
         super(aContext);
         final ITileSource coverageTileSource = new XYTileSource("Mozilla Location Service Coverage Map",
                 null,
-                12, 13, AbstractMapOverlay.TILE_PIXEL_SIZE,
+                MIN_ZOOM_LEVEL_OF_MAP, MIN_ZOOM_LEVEL_OF_MAP,
+                AbstractMapOverlay.TILE_PIXEL_SIZE,
                 ".png",
                 new String[] { coverageUrl });
         this.setLoadingBackgroundColor(Color.TRANSPARENT);

Diff for: android/src/main/java/org/mozilla/mozstumbler/client/mapview/tiles/LowResMapOverlay.java

@@ -21,15 +21,17 @@ public LowResMapOverlay(final Context aContext, boolean isMLSTileStore, MapView
 
         ITileSource coverageTileSource;
         if (isMLSTileStore) {
-            coverageTileSource = new XYTileSource("MozStumbler Tile Store",
-                    null,
-                    13, 13, AbstractMapOverlay.TILE_PIXEL_SIZE,
+            coverageTileSource = new XYTileSource("MozStumbler Tile Store", null,
+                    AbstractMapOverlay.MIN_ZOOM_LEVEL_OF_MAP,
+                    AbstractMapOverlay.MIN_ZOOM_LEVEL_OF_MAP,
+                    AbstractMapOverlay.TILE_PIXEL_SIZE,
                     AbstractMapOverlay.FILE_TYPE_SUFFIX_PNG,
                     new String[]{BuildConfig.TILE_SERVER_URL});
         } else {
-            coverageTileSource
-                    = new XYTileSource("MapquestOSM",
-                    ResourceProxy.string.mapquest_osm, 13, 13, AbstractMapOverlay.TILE_PIXEL_SIZE, ".jpg", new String[]{
+            coverageTileSource = new XYTileSource("MapquestOSM", ResourceProxy.string.mapquest_osm,
+                    AbstractMapOverlay.MIN_ZOOM_LEVEL_OF_MAP,
+                    AbstractMapOverlay.MIN_ZOOM_LEVEL_OF_MAP,
+                    AbstractMapOverlay.TILE_PIXEL_SIZE, ".jpg", new String[]{
                     "http://otile1.mqcdn.com/tiles/1.0.0/map/",
                     "http://otile2.mqcdn.com/tiles/1.0.0/map/",
                     "http://otile3.mqcdn.com/tiles/1.0.0/map/",