From c2a4a8822ce9577c972975da61034a30fb0fe3e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lukas.paczos@gmail.com>
Date: Tue, 11 Dec 2018 17:49:01 +0100
Subject: [android] properly stop renderer when dismissing an example dialog

---
 .../testapp/activity/maplayout/MapInDialogActivity.java     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'platform')

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 56104e801b..509b223d5f 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();
-- 
cgit v1.2.1