summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2018-12-11 17:49:01 +0100
committerŁukasz Paczos <lukas.paczos@gmail.com>2018-12-13 17:42:39 +0100
commit82743b0131393bb2fadbb7c223d4bca40b18f3f8 (patch)
treead707794df5a27c102f7fc7ff04e7634418cecff
parent3fbd9578c7bc016b0599d1df5d12125f325b9cda (diff)
downloadqtlocation-mapboxgl-upstream/lp-13310-dialog-crash.tar.gz
[android] properly stop renderer when dismissing an example dialogupstream/lp-13310-dialog-crash
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java13
1 files changed, 9 insertions, 4 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 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();
}
@@ -107,6 +106,12 @@ public class MapInDialogActivity extends AppCompatActivity {
}
@Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ mapView.onDestroy();
+ }
+
+ @Override
public void onLowMemory() {
super.onLowMemory();
mapView.onLowMemory();