diff options
author | Tobrun <tobrun@mapbox.com> | 2017-11-10 16:33:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-10 16:33:51 +0100 |
commit | a47f8245dacffad2b7f8f71a38b7eb41ee28b0b5 (patch) | |
tree | 86ad036c2c5c82961238a1e4b6d648decf9b7eec /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java | |
parent | 225fba8a0aad5ea52ff878443f58d65bb2221d74 (diff) | |
download | qtlocation-mapboxgl-a47f8245dacffad2b7f8f71a38b7eb41ee28b0b5.tar.gz |
Monkey crashes (#10440)
* [android] - avoid null map from trackballevent
* [android] - fixup animated marker test activity from monkey runs
* [android] - harden NativeMapView OnMapChangeListener
* [android] - harden against destroyed wrapper activity while moving touch pointers
* [android] - harden bulk marker activity for monkey runner
* [android] - harden scale end gesture event for null velocity tracker
* [android] - invalid mapboxMap invocation
* [android] - reset test setup
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java index 0366e50627..16c45ebea2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java @@ -238,16 +238,18 @@ final class Transform implements MapView.OnMapChangedListener { } void setZoom(double zoom, @NonNull PointF focalPoint, long duration) { - mapView.addOnMapChangedListener(new MapView.OnMapChangedListener() { - @Override - public void onMapChanged(int change) { - if (change == MapView.REGION_DID_CHANGE_ANIMATED) { - cameraChangeDispatcher.onCameraIdle(); - mapView.removeOnMapChangedListener(this); + if (mapView != null) { + mapView.addOnMapChangedListener(new MapView.OnMapChangedListener() { + @Override + public void onMapChanged(int change) { + if (change == MapView.REGION_DID_CHANGE_ANIMATED) { + cameraChangeDispatcher.onCameraIdle(); + mapView.removeOnMapChangedListener(this); + } } - } - }); - mapView.setZoom(zoom, focalPoint, duration); + }); + mapView.setZoom(zoom, focalPoint, duration); + } } // Direction |