diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-02-19 19:08:07 +0100 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2018-02-20 15:40:12 +0100 |
| commit | 17e5ae84af11006ed8336cd19eff57f65a6a577a (patch) | |
| tree | 184c22c583113dbaf3e2c669af4c8cd332309996 | |
| parent | 374bad18c04ae8fea574f85d2149af8aeffb8dcc (diff) | |
| download | qtlocation-mapboxgl-17e5ae84af11006ed8336cd19eff57f65a6a577a.tar.gz | |
[android] - check if hosting Activity isn't finishing before showing an dialog
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java index 2bcbd5ce40..5ccd6bd795 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java @@ -1,5 +1,6 @@ package com.mapbox.mapboxsdk.maps; +import android.app.Activity; import android.app.AlertDialog; import android.content.ActivityNotFoundException; import android.content.Context; @@ -48,7 +49,17 @@ public class AttributionDialogManager implements View.OnClickListener, DialogInt @Override public void onClick(View view) { attributionSet = new AttributionBuilder(mapboxMap).build(); - showAttributionDialog(getAttributionTitles()); + + boolean isActivityFinishing = false; + if (context instanceof Activity) { + isActivityFinishing = ((Activity) context).isFinishing(); + } + + // check is hosting activity isn't finishing + // https://github.com/mapbox/mapbox-gl-native/issues/11238 + if (!isActivityFinishing) { + showAttributionDialog(getAttributionTitles()); + } } protected void showAttributionDialog(String[] attributionTitles) { |