fix: Fix focus not running on UI Thread

mrousavy · Mar 1, 2024 · e4a5fe3 · e4a5fe3
1 parent c741c90
commit e4a5fe3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/package/android/src/main/java/com/mrousavy/camera/CameraView+Focus.kt b/package/android/src/main/java/com/mrousavy/camera/CameraView+Focus.kt
@@ -1,11 +1,14 @@
 package com.mrousavy.camera
 
 import com.facebook.react.bridge.ReadableMap
+import com.mrousavy.camera.utils.runOnUiThreadAndWait
 
 suspend fun CameraView.focus(pointMap: ReadableMap) {
   val x = pointMap.getDouble("x")
   val y = pointMap.getDouble("y")
 
-  val point = previewView.meteringPointFactory.createPoint(x.toFloat(), y.toFloat())
+  val point = runOnUiThreadAndWait {
+    previewView.meteringPointFactory.createPoint(x.toFloat(), y.toFloat())
+  }
   cameraSession.focus(point)
 }
diff --git a/package/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt b/package/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt
@@ -508,6 +508,7 @@ class CameraSession(private val context: Context, private val callback: Callback
     recording.resume()
   }
 
+  @SuppressLint("RestrictedApi")
   suspend fun focus(meteringPoint: MeteringPoint) {
     val camera = camera ?: throw CameraNotReadyError()
 
@@ -517,8 +518,14 @@ class CameraSession(private val context: Context, private val callback: Callback
     }
 
     try {
+      Log.i(TAG, "Focusing to ${action.meteringPointsAf.joinToString { "(${it.x}, ${it.y})" }}...")
       val future = camera.cameraControl.startFocusAndMetering(action)
-      future.await(CameraQueues.cameraExecutor)
+      val result = future.await(CameraQueues.cameraExecutor)
+      if (result.isFocusSuccessful) {
+        Log.i(TAG, "Focused successfully!")
+      } else {
+        Log.i(TAG, "Focus failed.")
+      }
     } catch (e: CameraControl.OperationCanceledException) {
       throw FocusCanceledError()
     }