Use wantsEvents

Author: m-bert

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt

@@ -222,8 +222,6 @@ open class GestureHandler {
 
   private fun isTrackingPointer(pointerId: Int) = trackedPointerIDs[pointerId] != -1
 
-  fun shouldHandleTouchEvent(event: MotionEvent) = isTrackingPointer(event.getPointerId(event.actionIndex))
-
   private fun needAdapt(event: MotionEvent): Boolean {
     if (event.pointerCount != trackedPointersIDsCount) {
       return true
@@ -581,11 +579,12 @@ open class GestureHandler {
     onStateChange(newState, oldState)
   }
 
-  fun wantEvents(): Boolean = isEnabled &&
+  fun wantsEvents(event: MotionEvent): Boolean = isEnabled &&
     state != STATE_FAILED &&
     state != STATE_CANCELLED &&
     state != STATE_END &&
-    trackedPointersIDsCount > 0
+    trackedPointersIDsCount > 0 &&
+    isTrackingPointer(event.getPointerId(event.actionIndex))
 
   open fun shouldRequireToWaitForFailure(handler: GestureHandler): Boolean {
     if (handler === this) {

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandlerOrchestrator.kt

@@ -251,9 +251,7 @@ class GestureHandlerOrchestrator(
     preparedHandlers.sortWith(handlersComparator)
 
     for (handler in preparedHandlers) {
-      if (handler.shouldHandleTouchEvent(event)) {
-        deliverEventToGestureHandler(handler, event)
-      }
+      deliverEventToGestureHandler(handler, event)
     }
   }
 
@@ -276,7 +274,8 @@ class GestureHandlerOrchestrator(
       handler.cancel()
       return
     }
-    if (!handler.wantEvents()) {
+
+    if (!handler.wantsEvents(sourceEvent)) {
       return
     }