diff options
| author | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-09-04 10:59:18 +0200 |
|---|---|---|
| committer | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-09-04 10:59:18 +0200 |
| commit | 66780f65916fb6bdf4509cec62d8db538a17142e (patch) | |
| tree | e9784568bffd92722e4f4a67ceacdd2f081cbfbc | |
| parent | 1099bb4920f670017327efaf9db24097d60e34e8 (diff) | |
| download | qtlocation-mapboxgl-upstream/12803-view-pager-savestate.tar.gz | |
[android] check if the map is destroyed before saving state in a fragmentupstream/12803-view-pager-savestate
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(); + } } /** |