fix: apply changes from review

teslamotors · Aug 8, 2024 · b8417d8 · b8417d8
1 parent 3b0f913
commit b8417d8
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/android/src/main/java/com/rncamerakit/RNCameraKitModule.kt b/android/src/main/java/com/rncamerakit/RNCameraKitModule.kt
@@ -69,15 +69,15 @@ class RNCameraKitModule(private val reactContext: ReactApplicationContext) : Nat
      */
     @ReactMethod
     override fun capture(options: ReadableMap?, tag: Double?, promise: Promise) {
-        // CameraManager does not allow us to return values
-        val context = reactContext
         val viewTag = tag?.toInt()
         if (viewTag != null && options != null) {
             val uiManager = UIManagerHelper.getUIManagerForReactTag(reactContext, viewTag)
-            context.runOnUiQueueThread {
+            reactContext.runOnUiQueueThread {
                 val camera = uiManager?.resolveView(viewTag) as CKCamera
                 camera.capture(options.toHashMap(), promise)
             }
+        } else {
+            promise.reject("E_CAPTURE_FAILED", "options or/and tag arguments are null, options: $options, tag: $viewTag")
         }
     }
 }
diff --git a/android/src/main/java/com/rncamerakit/RNCameraKitPackage.kt b/android/src/main/java/com/rncamerakit/RNCameraKitPackage.kt
@@ -34,7 +34,6 @@ class RNCameraKitPackage : TurboReactPackage() {
                 RNCameraKitModule.REACT_CLASS,
                 false,  // canOverrideExistingModule
                 false,  // needsEagerInit
-                true,  // hasConstants
                 false,  // isCxxModule
                 isTurboModule // isTurboModule
             )

diff --git a/android/src/main/java/com/rncamerakit/events/ErrorEvent.kt b/android/src/main/java/com/rncamerakit/events/ErrorEvent.kt
@@ -11,7 +11,7 @@ class ErrorEvent(
 ) : Event<ErrorEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
-    override fun getEventData(): WritableMap? =
+    override fun getEventData(): WritableMap =
         Arguments.createMap().apply {
             putString("errorMessage", errorMessage)
         }

diff --git a/android/src/main/java/com/rncamerakit/events/OrientationChangeEvent.kt b/android/src/main/java/com/rncamerakit/events/OrientationChangeEvent.kt
@@ -11,7 +11,7 @@ class OrientationChangeEvent(
 ) : Event<OrientationChangeEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
-    override fun getEventData(): WritableMap? =
+    override fun getEventData(): WritableMap =
         Arguments.createMap().apply {
             putInt("orientation", orientation)
         }

diff --git a/android/src/main/java/com/rncamerakit/events/PictureTakenEvent.kt b/android/src/main/java/com/rncamerakit/events/PictureTakenEvent.kt
@@ -11,7 +11,7 @@ class PictureTakenEvent(
 ) : Event<PictureTakenEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
-    override fun getEventData(): WritableMap? =
+    override fun getEventData(): WritableMap =
         Arguments.createMap().apply {
             putString("uri", uri)
         }

diff --git a/android/src/main/java/com/rncamerakit/events/ReadCodeEvent.kt b/android/src/main/java/com/rncamerakit/events/ReadCodeEvent.kt
@@ -12,7 +12,7 @@ class ReadCodeEvent(
 ) : Event<ReadCodeEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
-    override fun getEventData(): WritableMap? =
+    override fun getEventData(): WritableMap =
         Arguments.createMap().apply {
             putString("codeFormat", codeFormat)
             putString("codeStringValue", codeStringValue)

diff --git a/android/src/main/java/com/rncamerakit/events/ZoomEvent.kt b/android/src/main/java/com/rncamerakit/events/ZoomEvent.kt
@@ -11,7 +11,7 @@ class ZoomEvent(
 ) : Event<ZoomEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
-    override fun getEventData(): WritableMap? =
+    override fun getEventData(): WritableMap =
         Arguments.createMap().apply {
             putDouble("zoom", zoom)
         }