diff options
author | Tobrun <tobrun@mapbox.com> | 2017-03-09 17:20:44 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-09 17:20:44 -0800 |
commit | 803c1c46fe7092548b53c99b7ee3607b7fd9a312 (patch) | |
tree | 10cbc283488fd65fefa46ecf38f62cdace8bd621 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | |
parent | 1693b389d7d17315b8a2a9bdd862207ace053f77 (diff) | |
download | qtlocation-mapboxgl-803c1c46fe7092548b53c99b7ee3607b7fd9a312.tar.gz |
[android] - harden mapZoomButtonController to avoid null pointer exceptions (#8332)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index 8fa2d0b152..ac6c15f671 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -521,13 +521,15 @@ public class MapView extends FrameLayout { @CallSuper protected void onDetachedFromWindow() { super.onDetachedFromWindow(); - mapZoomButtonController.setVisible(false); + if (mapZoomButtonController != null) { + mapZoomButtonController.setVisible(false); + } } // Called when view is hidden and shown @Override protected void onVisibilityChanged(@NonNull View changedView, int visibility) { - if (isInEditMode()) { + if (isInEditMode() || mapZoomButtonController == null) { return; } mapZoomButtonController.setVisible(visibility == View.VISIBLE); |