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 56104e801..509b223d5 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 @@ -69,13 +69,12 @@ public class MapInDialogActivity extends AppCompatActivity { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { return new Dialog(getActivity(), getTheme()) { - boolean destroyed = false; - @Override public void dismiss() { - if (mapView != null && !destroyed) { + if (mapView != null && !mapView.isDestroyed()) { + mapView.onPause(); + mapView.onStop(); mapView.onDestroy(); - destroyed = true; } super.dismiss(); } @@ -106,6 +105,12 @@ public class MapInDialogActivity extends AppCompatActivity { mapView.onStop(); } + @Override + public void onDestroyView() { + super.onDestroyView(); + mapView.onDestroy(); + } + @Override public void onLowMemory() { super.onLowMemory();