Add nullability checks to RootSheetView (#86)

Co-authored-by: Jovanni Lo <[email protected]>
lodev09 · Aug 22, 2024 · dc78ad1 · dc78ad1
1 parent c4177e6
commit dc78ad1
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/android/src/main/java/com/lodev09/truesheet/core/RootSheetView.kt b/android/src/main/java/com/lodev09/truesheet/core/RootSheetView.kt
@@ -99,14 +99,14 @@ class RootSheetView(private val context: Context?) :
     get() = context as ThemedReactContext
 
   override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
-    jSTouchDispatcher.handleTouchEvent(event, eventDispatcher)
+    eventDispatcher?.let { jSTouchDispatcher.handleTouchEvent(event, it) }
     jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, true)
     return super.onInterceptTouchEvent(event)
   }
 
   @SuppressLint("ClickableViewAccessibility")
   override fun onTouchEvent(event: MotionEvent): Boolean {
-    jSTouchDispatcher.handleTouchEvent(event, eventDispatcher)
+    eventDispatcher?.let { jSTouchDispatcher.handleTouchEvent(event, it) }
     jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, false)
     super.onTouchEvent(event)
 
@@ -127,16 +127,20 @@ class RootSheetView(private val context: Context?) :
 
   @Deprecated("Deprecated in Java")
   override fun onChildStartedNativeGesture(ev: MotionEvent?) {
-    jSTouchDispatcher.onChildStartedNativeGesture(ev, eventDispatcher)
+    eventDispatcher?.let {
+      if (ev != null) {
+        jSTouchDispatcher.onChildStartedNativeGesture(ev, it)
+      }
+    }
   }
 
   override fun onChildStartedNativeGesture(childView: View, ev: MotionEvent) {
-    jSTouchDispatcher.onChildStartedNativeGesture(ev, eventDispatcher)
+    eventDispatcher?.let { jSTouchDispatcher.onChildStartedNativeGesture(ev, it) }
     jSPointerDispatcher?.onChildStartedNativeGesture(childView, ev, eventDispatcher)
   }
 
   override fun onChildEndedNativeGesture(childView: View, ev: MotionEvent) {
-    jSTouchDispatcher.onChildEndedNativeGesture(ev, eventDispatcher)
+    eventDispatcher?.let { jSTouchDispatcher.onChildEndedNativeGesture(ev, it) }
     jSPointerDispatcher?.onChildEndedNativeGesture()
   }