[android] Clear out mapCallback's OnMapReadyCallbacks on onDestroy

2017-08-28 15:02:44 -06:00
parent 95092df8e9
commit 6dbdf3aaeb
1 changed files with 5 additions and 0 deletions
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -264,6 +264,7 @@ public class MapView extends FrameLayout {
    nativeMapView.terminateContext();
    nativeMapView.terminateDisplay();
    nativeMapView.destroySurface();
+    mapCallback.clearOnMapReadyCallbacks();
    nativeMapView.destroy();
    nativeMapView = null;
  }
@@ -955,5 +956,9 @@ public class MapView extends FrameLayout {
    void addOnMapReadyCallback(OnMapReadyCallback callback) {
      onMapReadyCallbackList.add(callback);
    }
+
+    void clearOnMapReadyCallbacks() {
+      onMapReadyCallbackList.clear();
+    }
  }
 }