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 32c4952aa..91c77c3e3 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 @@ -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(); + } } }