[android] - optimise icon management

3 files changed, 52 insertions, 16 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
index edf448ab4f..c09c926eb5 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
@@ -118,6 +118,9 @@ class AnnotationManager {
 
       if (marker instanceof MarkerView) {
         markerViewManager.removeMarkerView((MarkerView) marker);
+      } else {
+        // do icon cleanup
+        iconManager.iconCleanup(marker.getIcon());
       }
     } else {
       // instanceOf Polygon/Polyline
@@ -137,6 +140,8 @@ class AnnotationManager {
 
         if (marker instanceof MarkerView) {
           markerViewManager.removeMarkerView((MarkerView) marker);
+        } else {
+          iconManager.iconCleanup(marker.getIcon());
         }
       } else {
         // instanceOf Polygon/Polyline
@@ -159,6 +164,8 @@ class AnnotationManager {
         marker.hideInfoWindow();
         if (marker instanceof MarkerView) {
           markerViewManager.removeMarkerView((MarkerView) marker);
+        } else {
+          iconManager.iconCleanup(marker.getIcon());
         }
       } else {
         // instanceOf Polygon/Polyline
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
index 18eecfd9c3..affbf48267 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
@@ -1,16 +1,17 @@
 package com.mapbox.mapboxsdk.maps;
 
 import android.graphics.Bitmap;
+import android.os.Build;
 
 import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.annotations.Icon;
 import com.mapbox.mapboxsdk.annotations.IconFactory;
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.annotations.MarkerView;
-import com.mapbox.mapboxsdk.exceptions.IconBitmapChangedException;
 
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Responsible for managing icons added to the Map.
@@ -25,15 +26,14 @@ import java.util.List;
  */
 class IconManager {
 
-  private NativeMapView nativeMapView;
-  private List<Icon> icons;
+  private final Map<Icon, Integer> iconMap = new HashMap<>();
 
+  private NativeMapView nativeMapView;
   private int highestIconWidth;
   private int highestIconHeight;
 
   IconManager(NativeMapView nativeMapView) {
     this.nativeMapView = nativeMapView;
-    this.icons = new ArrayList<>();
     // load transparent icon for MarkerView to trace actual markers, see #6352
     loadIcon(IconFactory.recreate(IconFactory.ICON_MARKERVIEW_ID, IconFactory.ICON_MARKERVIEW_BITMAP));
   }
@@ -83,13 +83,13 @@ class IconManager {
   }
 
   private void addIcon(Icon icon, boolean addIconToMap) {
-    if (!icons.contains(icon)) {
-      icons.add(icon);
+    if (!iconMap.keySet().contains(icon)) {
+      iconMap.put(icon, 1);
       if (addIconToMap) {
         loadIcon(icon);
       }
     } else {
-      validateIconChanged(icon);
+      iconMap.put(icon, iconMap.get(icon) + 1);
     }
   }
 
@@ -121,18 +121,11 @@ class IconManager {
   }
 
   void reloadIcons() {
-    for (Icon icon : icons) {
+    for (Icon icon : iconMap.keySet()) {
       loadIcon(icon);
     }
   }
 
-  private void validateIconChanged(Icon icon) {
-    Icon oldIcon = icons.get(icons.indexOf(icon));
-    if (!oldIcon.getBitmap().sameAs(icon.getBitmap())) {
-      throw new IconBitmapChangedException();
-    }
-  }
-
   void ensureIconLoaded(Marker marker, MapboxMap mapboxMap) {
     Icon icon = marker.getIcon();
     if (icon == null) {
@@ -149,4 +142,31 @@ class IconManager {
       marker.setTopOffsetPixels(getTopOffsetPixelsForIcon(icon));
     }
   }
+
+  public void iconCleanup(Icon icon) {
+    int refCounter = iconMap.get(icon) - 1;
+    if (refCounter == 0) {
+      remove(icon);
+    } else {
+      updateIconRefCounter(icon, refCounter);
+    }
+  }
+
+  private void remove(Icon icon) {
+    nativeMapView.removeAnnotationIcon(icon.getId());
+    iconMap.remove(icon);
+    if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      recycleBitmap(icon.getBitmap());
+    }
+  }
+
+  private void updateIconRefCounter(Icon icon, int refCounter) {
+    iconMap.put(icon, refCounter);
+  }
+
+  private void recycleBitmap(Bitmap bitmap) {
+    if (!bitmap.isRecycled()) {
+      bitmap.recycle();
+    }
+  }
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
index ddeb4b326e..b2d49bdbf8 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -507,6 +507,13 @@ final class NativeMapView {
     nativeAddAnnotationIcon(symbol, width, height, scale, pixels);
   }
 
+  public void removeAnnotationIcon(String symbol) {
+    if (isDestroyedOn("removeAnnotationIcon")) {
+      return;
+    }
+    nativeRemoveAnnotationIcon(symbol);
+  }
+
   public void setVisibleCoordinateBounds(LatLng[] coordinates, RectF padding, double direction, long duration) {
     if (isDestroyedOn("setVisibleCoordinateBounds")) {
       return;
@@ -990,6 +997,8 @@ final class NativeMapView {
 
   private native void nativeAddAnnotationIcon(String symbol, int width, int height, float scale, byte[] pixels);
 
+  private native void nativeRemoveAnnotationIcon(String symbol);
+
   private native void nativeSetVisibleCoordinateBounds(LatLng[] coordinates, RectF padding,
                                                        double direction, long duration);