1 files changed, 22 insertions, 13 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java
index 495360a168..ce00c9d18f 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java
@@ -1,6 +1,8 @@
 package com.mapbox.mapboxsdk.testapp.activity.maplayout;
 
+import android.app.Dialog;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentManager;
@@ -27,13 +29,10 @@ public class MapInDialogActivity extends AppCompatActivity {
     setContentView(R.layout.activity_map_in_dialog);
 
     Button button = (Button) findViewById(R.id.button_open_dialog);
-    button.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View view) {
-        FragmentManager fm = getSupportFragmentManager();
-        MapDialogFragment editNameDialogFragment = MapDialogFragment.newInstance("Map Dialog");
-        editNameDialogFragment.show(fm, "fragment_dialog_map");
-      }
+    button.setOnClickListener(view -> {
+      FragmentManager fm = getSupportFragmentManager();
+      MapDialogFragment editNameDialogFragment = MapDialogFragment.newInstance("Map Dialog");
+      editNameDialogFragment.show(fm, "fragment_dialog_map");
     });
   }
 
@@ -65,6 +64,22 @@ public class MapInDialogActivity extends AppCompatActivity {
       mapView.onCreate(savedInstanceState);
     }
 
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+      return new Dialog(getActivity(), getTheme()) {
+        boolean destroyed = false;
+        @Override
+        public void dismiss() {
+          if (mapView != null && !destroyed) {
+            mapView.onDestroy();
+            destroyed = true;
+          }
+          super.dismiss();
+        }
+      };
+    }
+
     @Override
     public void onStart() {
       super.onStart();
@@ -90,12 +105,6 @@ public class MapInDialogActivity extends AppCompatActivity {
     }
 
     @Override
-    public void onDestroy() {
-      super.onDestroy();
-      mapView.onDestroy();
-    }
-
-    @Override
     public void onLowMemory() {
       super.onLowMemory();
       mapView.onLowMemory();