[android] - validate if gestures should execute (#9173)

mapbox · Jun 2, 2017 · da53200 · da53200
1 parent 3b837d9
commit da53200
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/...ndroid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/...ndroid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
@@ -383,6 +383,14 @@ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float ve
     // Called for drags
     @Override
     public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+      if (!trackingSettings.isScrollGestureCurrentlyEnabled()) {
+        return false;
+      }
+
+      if (dragStarted) {
+        return false;
+      }
+
       if (!scrollInProgress) {
         scrollInProgress = true;
 
@@ -393,13 +401,6 @@ public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float d
           getLocationFromGesture(e1.getX(), e1.getY()),
           MapboxEvent.GESTURE_PAN_START, transform));
       }
-      if (!trackingSettings.isScrollGestureCurrentlyEnabled()) {
-        return false;
-      }
-
-      if (dragStarted) {
-        return false;
-      }
 
       // reset tracking if needed
       trackingSettings.resetTrackingModesIfRequired(true, false, false);