Avoid an exception on Android if disabling a gesture while it's activ…

…ated.
kaiterra · Mar 18, 2020 · 99d4ddc · 99d4ddc
1 parent c69e53b
commit 99d4ddc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerEvent.java b/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerEvent.java
@@ -72,6 +72,8 @@ public short getCoalescingKey() {
 
   @Override
   public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), EVENT_NAME, mExtraData);
+    if (mExtraData != null) {
+      rctEventEmitter.receiveEvent(getViewTag(), EVENT_NAME, mExtraData);
+    }
   }
 }
diff --git a/...id/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerStateChangeEvent.java b/...id/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerStateChangeEvent.java
@@ -77,6 +77,8 @@ public short getCoalescingKey() {
 
   @Override
   public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), EVENT_NAME, mExtraData);
+    if (mExtraData != null) {
+      rctEventEmitter.receiveEvent(getViewTag(), EVENT_NAME, mExtraData);
+    }
   }
 }