diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2019-03-05 12:03:56 +0100 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2019-03-06 14:22:43 +0100 |
commit | 500080ea6489bf7208859ed9bcfeefff16b301ad (patch) | |
tree | 3273b19e117aa29dc600a5bba587da60bfca45a6 /platform/android/MapboxGLAndroidSDKTestApp/src/main | |
parent | be75dc9a48764850ebb52e3bab7ae08b3370cd09 (diff) | |
download | qtlocation-mapboxgl-500080ea6489bf7208859ed9bcfeefff16b301ad.tar.gz |
[android] - fix dialog fragment setup, add regression test
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java | 28 |
1 files changed, 19 insertions, 9 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 509b223d5f..c9a9377885 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 @@ -52,14 +52,13 @@ public class MapInDialogActivity extends AppCompatActivity { } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { return inflater.inflate(R.layout.fragment_dialog_map, container); } @Override - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - mapView = view.findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); mapView.getMapAsync(mapboxMap -> mapboxMap.setStyle(Style.OUTDOORS)); @@ -75,6 +74,7 @@ public class MapInDialogActivity extends AppCompatActivity { mapView.onPause(); mapView.onStop(); mapView.onDestroy(); + mapView = null; } super.dismiss(); } @@ -96,31 +96,41 @@ public class MapInDialogActivity extends AppCompatActivity { @Override public void onPause() { super.onPause(); - mapView.onPause(); + if (mapView != null) { + mapView.onPause(); + } } @Override public void onStop() { super.onStop(); - mapView.onStop(); + if (mapView != null) { + mapView.onStop(); + } } @Override public void onDestroyView() { super.onDestroyView(); - mapView.onDestroy(); + if (mapView != null) { + mapView.onDestroy(); + } } @Override public void onLowMemory() { super.onLowMemory(); - mapView.onLowMemory(); + if (mapView != null) { + mapView.onLowMemory(); + } } @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - mapView.onSaveInstanceState(outState); + if (mapView != null) { + mapView.onSaveInstanceState(outState); + } } } -} +}
\ No newline at end of file |