diff options
author | Pablo Guardiola <guardiola31337@gmail.com> | 2017-11-16 16:06:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-16 16:06:22 +0100 |
commit | 30e59ce738c05e128398ef5109fdc08d208c2cf1 (patch) | |
tree | 59db6e0dda16b726add8c9e4aa2f0b865393f341 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java | |
parent | 1049c012255520606ee349a16f6b430db74a520f (diff) | |
download | qtlocation-mapboxgl-30e59ce738c05e128398ef5109fdc08d208c2cf1.tar.gz |
Monkey crashes (#10440) (#10472)
* [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/MapGestureDetector.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java index 4120e164a4..9d7d980ae3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java @@ -235,8 +235,10 @@ final class MapGestureDetector { velocityTracker = null; break; case MotionEvent.ACTION_MOVE: - velocityTracker.addMovement(event); - velocityTracker.computeCurrentVelocity(1000); + if (velocityTracker != null) { + velocityTracker.addMovement(event); + velocityTracker.computeCurrentVelocity(1000); + } break; } @@ -551,6 +553,11 @@ final class MapGestureDetector { // Called when fingers leave screen @Override public void onScaleEnd(final ScaleGestureDetector detector) { + if (velocityTracker == null) { + return; + } + + if (rotateGestureOccurred || quickZoom) { reset(); return; |