summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Darby <robin.darby@mapquest.com>2017-08-28 15:02:44 -0600
committerTobrun <tobrun@mapbox.com>2017-09-11 19:25:16 +0200
commita5bfb4ac40d94b63f1c9af11d9d25da64806fda1 (patch)
tree4761f7185d44b34a0d00dd5929543ff7cb358743
parent2bbde6903adbea1dc7accce591c79a1d9b33b00c (diff)
downloadqtlocation-mapboxgl-a5bfb4ac40d94b63f1c9af11d9d25da64806fda1.tar.gz
[android] Clear out mapCallback's OnMapReadyCallbacks on onDestroy
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java5
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();
+ }
}
}