react-native-maps 1.1.0 → 1.2.0-beta.2

package/android/src/main/java/com/airbnb/android/react/maps/AirMapPolylineManager.java

@@ -2,7 +2,6 @@ package com.airbnb.android.react.maps;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.WindowManager;
 
@@ -26,14 +25,10 @@ public class AirMapPolylineManager extends ViewGroupManager<AirMapPolyline> {
 
   public AirMapPolylineManager(ReactApplicationContext reactContext) {
     super();
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-      metrics = new DisplayMetrics();
-      ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
-          .getDefaultDisplay()
-          .getRealMetrics(metrics);
-    } else {
-      metrics = reactContext.getResources().getDisplayMetrics();
-    }
+    metrics = new DisplayMetrics();
+    ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
+        .getDefaultDisplay()
+        .getRealMetrics(metrics);
   }
 
   @Override

package/android/src/main/java/com/airbnb/android/react/maps/AirMapTileProvider.java

@@ -14,12 +14,8 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Rect;
 
-import androidx.annotation.NonNull;
 import androidx.work.OneTimeWorkRequest;
 import androidx.work.WorkManager;
-import androidx.work.WorkRequest;
-import androidx.work.Worker;
-import androidx.work.WorkerParameters;
 import androidx.work.Data;
 import androidx.work.Constraints;
 import androidx.work.NetworkType;
@@ -27,10 +23,7 @@ import androidx.work.ExistingWorkPolicy;
 import androidx.work.Operation;
 import androidx.work.WorkInfo;
 
-import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.Tile;
-import com.google.android.gms.maps.model.TileOverlay;
-import com.google.android.gms.maps.model.TileOverlayOptions;
 import com.google.android.gms.maps.model.TileProvider;
 import com.google.android.gms.maps.model.UrlTileProvider;
 
@@ -61,7 +54,7 @@ public class AirMapTileProvider implements TileProvider {
     @Override
     public URL getTileUrl(int x, int y, int zoom) {
 
-      if (AirMapTileProvider.this.flipY == true) {
+      if (AirMapTileProvider.this.flipY) {
         y = (1 << zoom) - y - 1;
       }
 
@@ -69,14 +62,14 @@ public class AirMapTileProvider implements TileProvider {
           .replace("{x}", Integer.toString(x))
           .replace("{y}", Integer.toString(y))
           .replace("{z}", Integer.toString(zoom));
-      URL url = null;
+      URL url;
 
       if(AirMapTileProvider.this.maximumZ > 0 && zoom > AirMapTileProvider.this.maximumZ) {
-        return url;
+        return null;
       }
 
       if(AirMapTileProvider.this.minimumZ > 0 && zoom < AirMapTileProvider.this.minimumZ) {
-        return url;
+        return null;
       }
 
       try {
@@ -152,7 +145,7 @@ public class AirMapTileProvider implements TileProvider {
     if (image == null && this.tileCachePath != null && this.offlineMode) {
       Log.d("urlTile", "findLowerZoomTileForScaling");
       int zoomLevelToStart = (zoom > this.maximumNativeZ) ? this.maximumNativeZ - 1 : zoom - 1; 
-      int minimumZoomToSearch = this.minimumZ >= zoom - 3 ? this.minimumZ : zoom - 3;
+      int minimumZoomToSearch = Math.max(this.minimumZ, zoom - 3);
       for (int tryZoom = zoomLevelToStart; tryZoom >= minimumZoomToSearch; tryZoom--) {
   			image = scaleLowerZoomTile(x, y, zoom, tryZoom);
 	  		if (image != null) {
@@ -166,16 +159,15 @@ public class AirMapTileProvider implements TileProvider {
 
 	byte[] getTileImage(int x, int y, int zoom) {
 		byte[] image = null;
-		boolean fallbackOnSyncFetch = false;
-		
+
 		if (this.tileCachePath != null) {
 			image = readTileImage(x, y, zoom);
 			if (image != null) {
-				Log.d("urlTile", "tile cache HIT for " + Integer.toString(zoom) +
-					"/" + Integer.toString(x) + "/" + Integer.toString(y));
+				Log.d("urlTile", "tile cache HIT for " + zoom +
+					"/" + x + "/" + y);
 			} else {
-				Log.d("urlTile", "tile cache MISS for " + Integer.toString(zoom) +
-        	"/" + Integer.toString(x) + "/" + Integer.toString(y));
+				Log.d("urlTile", "tile cache MISS for " + zoom +
+        	"/" + x + "/" + y);
 			}
 			if (image != null && !this.offlineMode) {
 				checkForRefresh(x, y, zoom);
@@ -198,39 +190,35 @@ public class AirMapTileProvider implements TileProvider {
 						.build()
 					)
 				.build();
-			if (tileRefreshWorkRequest != null) {
-				WorkManager workManager = WorkManager.getInstance(this.context.getApplicationContext());
-				Operation fetchOperation = workManager
-					.enqueueUniqueWork(fileName, ExistingWorkPolicy.KEEP, tileRefreshWorkRequest);
-				Future<Operation.State.SUCCESS> operationFuture = fetchOperation.getResult();
-				try {
-					operationFuture.get(1L, TimeUnit.SECONDS);
-					Thread.sleep(500);
-					Future<List<WorkInfo>> fetchFuture = workManager.getWorkInfosByTag(fileName);
-					List<WorkInfo> workInfo = fetchFuture.get(1L, TimeUnit.SECONDS);
-					Log.d("urlTile: ", workInfo.get(0).toString());
-					if (this.tileCachePath != null) {
-						image = readTileImage(x, y, zoom);
-						if (image != null) {
-							Log.d("urlTile","tile cache fetch HIT for " + Integer.toString(zoom) +
-								"/" + Integer.toString(x) + "/" + Integer.toString(y));
-						} else {
-								Log.d("urlTile","tile cache fetch MISS for " + Integer.toString(zoom) +
-									"/" + Integer.toString(x) + "/" + Integer.toString(y));
-						}
+			WorkManager workManager = WorkManager.getInstance(this.context.getApplicationContext());
+			Operation fetchOperation = workManager
+				.enqueueUniqueWork(fileName, ExistingWorkPolicy.KEEP, tileRefreshWorkRequest);
+			Future<Operation.State.SUCCESS> operationFuture = fetchOperation.getResult();
+			try {
+				operationFuture.get(1L, TimeUnit.SECONDS);
+				Thread.sleep(500);
+				Future<List<WorkInfo>> fetchFuture = workManager.getWorkInfosByTag(fileName);
+				List<WorkInfo> workInfo = fetchFuture.get(1L, TimeUnit.SECONDS);
+				Log.d("urlTile: ", workInfo.get(0).toString());
+				if (this.tileCachePath != null) {
+					image = readTileImage(x, y, zoom);
+					if (image != null) {
+						Log.d("urlTile","tile cache fetch HIT for " + zoom +
+							"/" + x + "/" + y);
+					} else {
+							Log.d("urlTile","tile cache fetch MISS for " + zoom +
+								"/" + x + "/" + y);
 					}
-				} catch (Exception e) {
-      			e.printStackTrace();
 				}
-			} else {
-				fallbackOnSyncFetch = true;
+			} catch (Exception e) {
+			  e.printStackTrace();
 			}
-		} else if (fallbackOnSyncFetch || (image == null && !this.offlineMode)) {
+		} else if (image == null && !this.offlineMode) {
 			Log.d("urlTile", "Normal fetch");
 			image = fetchTile(x, y, zoom);
 			if (image == null) {
-				Log.d("urlTile", "tile fetch TIMEOUT / FAIL for " + Integer.toString(zoom) +
-					"/" + Integer.toString(x) + "/" + Integer.toString(y));
+				Log.d("urlTile", "tile fetch TIMEOUT / FAIL for " + zoom +
+					"/" + x + "/" + y);
 			}
 		}
 
@@ -304,7 +292,7 @@ public class AirMapTileProvider implements TileProvider {
     int yParent = y >> overZoomLevel;
     int zoomParent = zoom - overZoomLevel;
     
-    int xOffset = x % zoomFactor;;
+    int xOffset = x % zoomFactor;
     int yOffset = y % zoomFactor;
 
     byte[] data;
@@ -351,11 +339,9 @@ public class AirMapTileProvider implements TileProvider {
 						.build()
 					)
 				.build();
-			if (tileRefreshWorkRequest != null) {
-				WorkManager.getInstance(this.context.getApplicationContext())
-				.enqueueUniqueWork(fileName, ExistingWorkPolicy.KEEP, tileRefreshWorkRequest);
-			} 
-		} 
+			WorkManager.getInstance(this.context.getApplicationContext())
+			.enqueueUniqueWork(fileName, ExistingWorkPolicy.KEEP, tileRefreshWorkRequest);
+		}
 	}
 
 	byte[] fetchTile(int x, int y, int zoom) {
@@ -377,10 +363,7 @@ public class AirMapTileProvider implements TileProvider {
 			buffer.flush();
 
 			return buffer.toByteArray();
-		} catch (IOException e) {
-			e.printStackTrace();
-			return null;
-		} catch (OutOfMemoryError e) {
+		} catch (IOException | OutOfMemoryError e) {
 			e.printStackTrace();
 			return null;
 		} finally {
@@ -416,10 +399,7 @@ public class AirMapTileProvider implements TileProvider {
 			}
 
 			return buffer.toByteArray();
-		} catch (IOException e) {
-			e.printStackTrace();
-			return null;
-		} catch (OutOfMemoryError e) {
+		} catch (IOException | OutOfMemoryError e) {
 			e.printStackTrace();
 			return null;
 		} finally {
@@ -442,10 +422,7 @@ public class AirMapTileProvider implements TileProvider {
 			out.write(image);
 
 			return true;
-		} catch (IOException e) {
-			e.printStackTrace();
-			return false;
-		} catch (OutOfMemoryError e) {
+		} catch (IOException | OutOfMemoryError e) {
 			e.printStackTrace();
 			return false;
 		} finally {
@@ -457,9 +434,8 @@ public class AirMapTileProvider implements TileProvider {
 		if (this.tileCachePath == null) {
 			return null;
 		}
-		String s = this.tileCachePath + '/' + Integer.toString(zoom) + 
-			"/" + Integer.toString(x) + "/" + Integer.toString(y);
-		return s;
+		return this.tileCachePath + '/' + zoom +
+			"/" + x + "/" + y;
 	}
 	
 	protected URL getTileUrl(int x, int y, int zoom) {
@@ -510,6 +486,5 @@ public class AirMapTileProvider implements TileProvider {
 	}
 
 	public void setCustomMode() {
-		this.customMode = customMode;
 	}
 }

package/android/src/main/java/com/airbnb/android/react/maps/AirMapTileWorker.java

@@ -10,7 +10,6 @@ import androidx.work.WorkerParameters;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -30,8 +29,8 @@ public class AirMapTileWorker extends Worker {
 
 	@Override
 	public Result doWork() {
-		byte[] image = null;
-		URL url = null;
+		byte[] image;
+		URL url;
     String fileName = getInputData().getString("filename");
 
     try {
@@ -84,10 +83,7 @@ public class AirMapTileWorker extends Worker {
         buffer.flush();
 
         return buffer.toByteArray();
-      } catch (IOException e) {
-        e.printStackTrace();
-        return null;
-      } catch (OutOfMemoryError e) {
+      } catch (IOException | OutOfMemoryError e) {
         e.printStackTrace();
         return null;
       } finally {
@@ -109,10 +105,7 @@ public class AirMapTileWorker extends Worker {
         out.write(image);
 
         return true;
-      } catch (IOException e) {
-        e.printStackTrace();
-        return false;
-      } catch (OutOfMemoryError e) {
+      } catch (IOException | OutOfMemoryError e) {
         e.printStackTrace();
         return false;
       } finally {

package/android/src/main/java/com/airbnb/android/react/maps/AirMapUrlTile.java

@@ -87,7 +87,7 @@ public class AirMapUrlTile extends AirMapFeature {
   public void setFlipY(boolean flipY) {
     this.flipY = flipY;
     if (tileProvider != null) {
-      tileProvider.setFlipY((boolean)flipY);
+      tileProvider.setFlipY(flipY);
     }
     if (tileOverlay != null) {
       tileOverlay.clearTileCache();
@@ -97,7 +97,7 @@ public class AirMapUrlTile extends AirMapFeature {
   public void setDoubleTileSize(boolean doubleTileSize) {
     this.doubleTileSize = doubleTileSize;
     if (tileProvider != null) {
-      tileProvider.setDoubleTileSize((boolean)doubleTileSize);
+      tileProvider.setDoubleTileSize(doubleTileSize);
     }
     setCustomTileProviderMode();
     if (tileOverlay != null) {
@@ -149,7 +149,7 @@ public class AirMapUrlTile extends AirMapFeature {
   public void setOfflineMode(boolean offlineMode) {
     this.offlineMode = offlineMode;
     if (tileProvider != null) {
-      tileProvider.setOfflineMode((boolean)offlineMode);
+      tileProvider.setOfflineMode(offlineMode);
     }
     if (tileOverlay != null) {
       tileOverlay.clearTileCache();

package/android/src/main/java/com/airbnb/android/react/maps/AirMapUrlTileManager.java

@@ -1,7 +1,6 @@
 package com.airbnb.android.react.maps;
 
 import android.content.Context;
-import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.WindowManager;
 
@@ -11,18 +10,13 @@ import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
 public class AirMapUrlTileManager extends ViewGroupManager<AirMapUrlTile> {
-  private DisplayMetrics metrics;
 
   public AirMapUrlTileManager(ReactApplicationContext reactContext) {
     super();
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-      metrics = new DisplayMetrics();
-      ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
-          .getDefaultDisplay()
-          .getRealMetrics(metrics);
-    } else {
-      metrics = reactContext.getResources().getDisplayMetrics();
-    }
+    DisplayMetrics metrics = new DisplayMetrics();
+    ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
+        .getDefaultDisplay()
+        .getRealMetrics(metrics);
   }
 
   @Override

package/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java

@@ -5,10 +5,8 @@ import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Point;
-import android.graphics.PorterDuff;
-import android.graphics.Rect;
-import android.os.Build;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.PermissionChecker;
 import androidx.core.view.GestureDetectorCompat;
@@ -33,7 +31,6 @@ import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerModule;
-import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.google.android.gms.maps.CameraUpdate;
 import com.google.android.gms.maps.CameraUpdateFactory;
@@ -54,7 +51,6 @@ import com.google.android.gms.maps.model.PointOfInterest;
 import com.google.android.gms.maps.model.Polygon;
 import com.google.android.gms.maps.model.Polyline;
 import com.google.android.gms.maps.model.TileOverlay;
-import com.google.android.gms.maps.model.VisibleRegion;
 import com.google.android.gms.maps.model.IndoorBuilding;
 import com.google.android.gms.maps.model.IndoorLevel;
 import com.google.maps.android.data.kml.KmlContainer;
@@ -78,7 +74,6 @@ import static androidx.core.content.PermissionChecker.checkSelfPermission;
 public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener, GoogleMap.OnIndoorStateChangeListener {
   public GoogleMap map;
-  private KmlLayer kmlLayer;
   private ProgressBar mapLoadingProgressBar;
   private RelativeLayout mapLoadingLayout;
   private ImageView cacheImageView;
@@ -118,9 +113,9 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
   private boolean destroyed = false;
   private final ThemedReactContext context;
   private final EventDispatcher eventDispatcher;
-  private FusedLocationSource fusedLocationSource;
+  private final FusedLocationSource fusedLocationSource;
 
-  private ViewAttacherGroup attacherGroup;
+  private final ViewAttacherGroup attacherGroup;
   private LatLng tapLocation;
 
   private static boolean contextHasBug(Context context) {
@@ -147,9 +142,8 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
         superContext = reactContext.getCurrentActivity();
       } else if (!contextHasBug(reactContext.getApplicationContext())) {
         superContext = reactContext.getApplicationContext();
-      } else {
-        // ¯\_(ツ)_/¯
       }
+
     }
     return superContext;
   }
@@ -214,7 +208,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
   }
 
   @Override
-  public void onMapReady(final GoogleMap map) {
+  public void onMapReady(@NonNull final GoogleMap map) {
     if (destroyed) {
       return;
     }
@@ -243,9 +237,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
         coordinate.putDouble("accuracy", location.getAccuracy());
         coordinate.putDouble("speed", location.getSpeed());
         coordinate.putDouble("heading", location.getBearing());
-        if(android.os.Build.VERSION.SDK_INT >= 18){
         coordinate.putBoolean("isFromMockProvider", location.isFromMockProvider());
-        }
 
         event.putMap("coordinate", coordinate);
 
@@ -531,8 +523,8 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
 
     ReadableMap center = camera.getMap("center");
     if (center != null) {
-      Double lng = center.getDouble("longitude");
-      Double lat = center.getDouble("latitude");
+      double lng = center.getDouble("longitude");
+      double lat = center.getDouble("latitude");
       builder.target(new LatLng(lat, lng));
     }
 
@@ -628,24 +620,13 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
         color = Color.parseColor("#606060");
       }
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        ColorStateList progressTintList = ColorStateList.valueOf(loadingIndicatorColor);
-        ColorStateList secondaryProgressTintList = ColorStateList.valueOf(loadingIndicatorColor);
-        ColorStateList indeterminateTintList = ColorStateList.valueOf(loadingIndicatorColor);
+      ColorStateList progressTintList = ColorStateList.valueOf(loadingIndicatorColor);
+      ColorStateList secondaryProgressTintList = ColorStateList.valueOf(loadingIndicatorColor);
+      ColorStateList indeterminateTintList = ColorStateList.valueOf(loadingIndicatorColor);
 
-        this.mapLoadingProgressBar.setProgressTintList(progressTintList);
-        this.mapLoadingProgressBar.setSecondaryProgressTintList(secondaryProgressTintList);
-        this.mapLoadingProgressBar.setIndeterminateTintList(indeterminateTintList);
-      } else {
-        PorterDuff.Mode mode = PorterDuff.Mode.SRC_IN;
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1) {
-          mode = PorterDuff.Mode.MULTIPLY;
-        }
-        if (this.mapLoadingProgressBar.getIndeterminateDrawable() != null)
-          this.mapLoadingProgressBar.getIndeterminateDrawable().setColorFilter(color, mode);
-        if (this.mapLoadingProgressBar.getProgressDrawable() != null)
-          this.mapLoadingProgressBar.getProgressDrawable().setColorFilter(color, mode);
-      }
+      this.mapLoadingProgressBar.setProgressTintList(progressTintList);
+      this.mapLoadingProgressBar.setSecondaryProgressTintList(secondaryProgressTintList);
+      this.mapLoadingProgressBar.setIndeterminateTintList(indeterminateTintList);
     }
   }
 
@@ -931,8 +912,8 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
 
     for (int i = 0; i < coordinatesArray.size(); i++) {
       ReadableMap latLng = coordinatesArray.getMap(i);
-      Double lat = latLng.getDouble("latitude");
-      Double lng = latLng.getDouble("longitude");
+      double lat = latLng.getDouble("latitude");
+      double lng = latLng.getDouble("longitude");
       builder.include(new LatLng(lat, lng));
     }
 
@@ -986,12 +967,12 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
 
     LatLngBounds.Builder builder = new LatLngBounds.Builder();
 
-    Double latNE = northEast.getDouble("latitude");
-    Double lngNE = northEast.getDouble("longitude");
+    double latNE = northEast.getDouble("latitude");
+    double lngNE = northEast.getDouble("longitude");
     builder.include(new LatLng(latNE, lngNE));
 
-    Double latSW = southWest.getDouble("latitude");
-    Double lngSW = southWest.getDouble("longitude");
+    double latSW = southWest.getDouble("latitude");
+    double lngSW = southWest.getDouble("longitude");
     builder.include(new LatLng(latSW, lngSW));
 
     LatLngBounds bounds = builder.build();
@@ -1188,7 +1169,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
         return;
       }
 
-      kmlLayer = new KmlLayer(map, kmlStream, context);
+      KmlLayer kmlLayer = new KmlLayer(map, kmlStream, context);
       kmlLayer.addLayerToMap();
 
       WritableMap pointers = new WritableNativeMap();
@@ -1211,7 +1192,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
         container = container.getContainers().iterator().next();
       }
 
-      Integer index = 0;
+      int index = 0;
       for (KmlPlacemark placemark : container.getPlacemarks()) {
         MarkerOptions options = new MarkerOptions();
 
@@ -1265,13 +1246,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
 
       manager.pushEvent(context, this, "onKmlReady", pointers);
 
-    } catch (XmlPullParserException e) {
-      e.printStackTrace();
-    } catch (IOException e) {
-      e.printStackTrace();
-    } catch (InterruptedException e) {
-      e.printStackTrace();
-    } catch (ExecutionException e) {
+    } catch (XmlPullParserException | IOException | InterruptedException | ExecutionException e) {
       e.printStackTrace();
     }
   }

package/android/src/main/java/com/airbnb/android/react/maps/AirMapWMSTile.java

@@ -2,10 +2,6 @@ package com.airbnb.android.react.maps;
 
 import android.content.Context;
 
-import android.util.Log;
-
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.model.TileOverlay;
 import com.google.android.gms.maps.model.TileOverlayOptions;
 import com.google.android.gms.maps.model.UrlTileProvider;
 
@@ -20,7 +16,7 @@ public class AirMapWMSTile extends AirMapUrlTile {
 
     class AIRMapWMSTileProvider extends UrlTileProvider {
     private String urlTemplate;
-    private int tileSize;
+    private final int tileSize;
 
     public AIRMapWMSTileProvider(int width, int height, String urlTemplate) {
       super(width, height);
@@ -80,8 +76,6 @@ public class AirMapWMSTile extends AirMapUrlTile {
     }
   }
 
-  private AIRMapGSUrlTileProvider tileProvider;
-
   public AirMapWMSTile(Context context) {
     super(context);
   }
@@ -91,10 +85,10 @@ public class AirMapWMSTile extends AirMapUrlTile {
     TileOverlayOptions options = new TileOverlayOptions();
     options.zIndex(zIndex);
     options.transparency(1 - this.opacity);
-    this.tileProvider = new AIRMapGSUrlTileProvider((int)this.tileSize, this.urlTemplate, 
-      (int)this.maximumZ, (int)this.maximumNativeZ, (int)this.minimumZ, this.tileCachePath, 
-      (int)this.tileCacheMaxAge, this.offlineMode, this.context, this.customTileProviderNeeded);
-    options.tileProvider(this.tileProvider);
+    AIRMapGSUrlTileProvider tileProvider = new AIRMapGSUrlTileProvider((int) this.tileSize, this.urlTemplate,
+            (int) this.maximumZ, (int) this.maximumNativeZ, (int) this.minimumZ, this.tileCachePath,
+            (int) this.tileCacheMaxAge, this.offlineMode, this.context, this.customTileProviderNeeded);
+    options.tileProvider(tileProvider);
     return options;
   }
 }

package/android/src/main/java/com/airbnb/android/react/maps/AirMapWMSTileManager.java

@@ -1,7 +1,6 @@
 package com.airbnb.android.react.maps;
 
 import android.content.Context;
-import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.WindowManager;
 
@@ -11,18 +10,13 @@ import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
 public class AirMapWMSTileManager extends ViewGroupManager<AirMapWMSTile> {
-  private DisplayMetrics metrics;
 
   public AirMapWMSTileManager(ReactApplicationContext reactContext) {
     super();
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-      metrics = new DisplayMetrics();
-      ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
-          .getDefaultDisplay()
-          .getRealMetrics(metrics);
-    } else {
-      metrics = reactContext.getResources().getDisplayMetrics();
-    }
+    DisplayMetrics metrics = new DisplayMetrics();
+    ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
+        .getDefaultDisplay()
+        .getRealMetrics(metrics);
   }
 
   @Override

package/android/src/main/java/com/airbnb/android/react/maps/FileUtil.java

@@ -18,10 +18,6 @@ import java.nio.channels.ReadableByteChannel;
 
 public class FileUtil extends AsyncTask<String, Void, InputStream> {
 
-  private final String NAME = "FileUtil";
-  private final String TEMP_FILE_SUFFIX = "temp";
-
-  private Exception exception;
   private Context context;
 
   public FileUtil(Context context) {
@@ -39,7 +35,6 @@ public class FileUtil extends AsyncTask<String, Void, InputStream> {
       }
       return context.getContentResolver().openInputStream(fileContentUri);
     } catch (Exception e) {
-      this.exception = e;
       FLog.e(
           ReactConstants.TAG,
           "Could not retrieve file for contentUri " + urls[0],
@@ -51,6 +46,8 @@ public class FileUtil extends AsyncTask<String, Void, InputStream> {
   private InputStream getDownloadFileInputStream(Context context, Uri uri)
       throws IOException {
     final File outputDir = context.getApplicationContext().getCacheDir();
+    String NAME = "FileUtil";
+    String TEMP_FILE_SUFFIX = "temp";
     final File file = File.createTempFile(NAME, TEMP_FILE_SUFFIX, outputDir);
     file.deleteOnExit();
 

package/android/src/main/java/com/airbnb/android/react/maps/ImageReader.java

@@ -49,7 +49,7 @@ public class ImageReader {
             imageReference = dataSource.getResult();
             if (imageReference != null) {
               CloseableImage image = imageReference.get();
-              if (image != null && image instanceof CloseableStaticBitmap) {
+              if (image instanceof CloseableStaticBitmap) {
                 CloseableStaticBitmap closeableStaticBitmap = (CloseableStaticBitmap) image;
                 Bitmap bitmap = closeableStaticBitmap.getUnderlyingBitmap();
                 if (bitmap != null) {
@@ -104,11 +104,9 @@ public class ImageReader {
       logoHolder.setController(controller);
     } else {
       BitmapDescriptor iconBitmapDescriptor = getBitmapDescriptorByName(uri);
-      if (iconBitmapDescriptor != null) {
-        imp.setIconBitmapDescriptor(iconBitmapDescriptor);
-        imp.setIconBitmap(BitmapFactory.decodeResource(this.resources, getDrawableResourceByName
-            (uri)));
-      }
+      imp.setIconBitmapDescriptor(iconBitmapDescriptor);
+      imp.setIconBitmap(BitmapFactory.decodeResource(this.resources, getDrawableResourceByName
+          (uri)));
       imp.update();
     }