[android] - avoid leaking dialog when context is being stopped

1 files changed, 15 insertions, 4 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 896d67483d..f5a31d2c6a 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
@@ -69,6 +69,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
   private NativeMapView nativeMapView;
   @Nullable
   private MapboxMap mapboxMap;
+  private AttributionClickListener attributionClickListener;
   private MapboxMapOptions mapboxMapOptions;
   private MapRenderer mapRenderer;
   private boolean destroyed;
@@ -180,7 +181,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
     mapboxMap.injectLocationComponent(new LocationComponent(mapboxMap));
 
     // inject widgets with MapboxMap
-    attrView.setOnClickListener(new AttributionClickListener(context, mapboxMap));
+    attrView.setOnClickListener(attributionClickListener = new AttributionClickListener(context, mapboxMap));
 
     // Ensure this view is interactable
     setClickable(true);
@@ -379,6 +380,8 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
    */
   @UiThread
   public void onStop() {
+    attributionClickListener.onStop();
+
     if (mapboxMap != null) {
       // map was destroyed before it was started
       mapGestureDetector.cancelAnimators();
@@ -731,7 +734,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
 
   /**
 
-  /**
+   /**
    * Set a callback that's invoked when the style has finished loading.
    *
    * @param listener The callback that's invoked when the style has finished loading
@@ -1219,11 +1222,19 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
 
     @Override
     public void onClick(View v) {
+      getDialogManager().onClick(v);
+    }
+
+    public void onStop() {
+      getDialogManager().onStop();
+    }
+
+    private AttributionDialogManager getDialogManager() {
       AttributionDialogManager customDialogManager = uiSettings.getAttributionDialogManager();
       if (customDialogManager != null) {
-        uiSettings.getAttributionDialogManager().onClick(v);
+        return uiSettings.getAttributionDialogManager();
       } else {
-        defaultDialogManager.onClick(v);
+        return defaultDialogManager;
       }
     }
   }