From a8d22305aa618e4a0ca80e74694a75100a283040 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Tue, 24 Apr 2018 14:01:48 +0200 Subject: [android] - clear map change listeners when map is destroyed --- .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 1 + .../src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java | 5 +++-- 2 files changed, 4 insertions(+), 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 index 9227aabdf3..4ecd7c9246 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 @@ -410,6 +410,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { @UiThread public void onDestroy() { destroyed = true; + onMapChangedListeners.clear(); mapCallback.clearOnMapReadyCallbacks(); if (nativeMapView != null && hasSurface) { 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 6ba87b4238..7cae0d0791 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 @@ -100,9 +100,10 @@ final class NativeMapView { } public void destroy() { - nativeDestroy(); - viewCallback = null; destroyed = true; + onMapChangedListeners.clear(); + viewCallback = null; + nativeDestroy(); } public void update() { -- cgit v1.2.1