diff options
author | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-09-04 10:59:18 +0200 |
---|---|---|
committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2018-09-04 11:59:10 +0200 |
commit | 18b43f29cfd7d2a4b316854e910ddf8adaf00fcb (patch) | |
tree | 8d1c0e5703a3327f61e2edd0927b6995e06c4e51 /platform/android/MapboxGLAndroidSDK | |
parent | 69b7c2fe46bb35eff230c983bacd09fd7cc7bf90 (diff) | |
download | qtlocation-mapboxgl-18b43f29cfd7d2a4b316854e910ddf8adaf00fcb.tar.gz |
[android] check if the map is destroyed before saving state in a fragment
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK')
2 files changed, 12 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java index f1e057f060..17670abd09 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java @@ -165,7 +165,9 @@ public final class MapFragment extends Fragment implements OnMapReadyCallback { @Override public void onSaveInstanceState(@NonNull Bundle outState) { super.onSaveInstanceState(outState); - map.onSaveInstanceState(outState); + if (map != null && !map.isDestroyed()) { + map.onSaveInstanceState(outState); + } } /** @@ -183,7 +185,9 @@ public final class MapFragment extends Fragment implements OnMapReadyCallback { @Override public void onLowMemory() { super.onLowMemory(); - map.onLowMemory(); + if (map != null && !map.isDestroyed()) { + map.onLowMemory(); + } } /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java index 005e8b19d2..590851d354 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java @@ -160,7 +160,9 @@ public class SupportMapFragment extends Fragment implements OnMapReadyCallback { @Override public void onSaveInstanceState(@NonNull Bundle outState) { super.onSaveInstanceState(outState); - map.onSaveInstanceState(outState); + if (map != null && !map.isDestroyed()) { + map.onSaveInstanceState(outState); + } } /** @@ -178,7 +180,9 @@ public class SupportMapFragment extends Fragment implements OnMapReadyCallback { @Override public void onLowMemory() { super.onLowMemory(); - map.onLowMemory(); + if (map != null && !map.isDestroyed()) { + map.onLowMemory(); + } } /** |