Merge branch 'robindarby-mapview-mapCallback-clear-ondestroy' of https://github.com/robindarby/mapbox-gl-native into robindarby-robindarby-mapview-mapCallback-clear-ondestroyupstream/robindarby-robindarby-mapview-mapCallback-clear-ondestroy

1 files changed, 5 insertions, 0 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
index cfe042d1f9..4d6189ddcf 100644
--- 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
@@ -296,6 +296,7 @@ public class MapView extends FrameLayout {
   @UiThread
   public void onDestroy() {
     destroyed = true;
+    mapCallback.clearOnMapReadyCallbacks();
     nativeMapView.destroy();
     nativeMapView = null;
   }
@@ -1014,5 +1015,9 @@ public class MapView extends FrameLayout {
     void addOnMapReadyCallback(OnMapReadyCallback callback) {
       onMapReadyCallbackList.add(callback);
     }
+
+    void clearOnMapReadyCallbacks() {
+      onMapReadyCallbackList.clear();
+    }
   }
 }