[android] - clear map change listeners when map is destroyed

mapbox · Apr 24, 2018 · a8d2230 · a8d2230
1 parent 62b80c3
commit a8d2230
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -410,6 +410,7 @@ public void onStop() {
   @UiThread
   public void onDestroy() {
     destroyed = true;
+    onMapChangedListeners.clear();
     mapCallback.clearOnMapReadyCallbacks();
 
     if (nativeMapView != null && hasSurface) {

diff --git a/...orm/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/...orm/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -100,9 +100,10 @@ private boolean isDestroyedOn(String callingMethod) {
   }
 
   public void destroy() {
-    nativeDestroy();
-    viewCallback = null;
     destroyed = true;
+    onMapChangedListeners.clear();
+    viewCallback = null;
+    nativeDestroy();
   }
 
   public void update() {