Reflect correct torch state

.github/workflows/ci.yml

@@ -78,7 +78,7 @@ jobs:
 
   verify-ios:
     name: Verify iOS
-    runs-on: macos-latest
+    runs-on: macos-14
     timeout-minutes: 10
     steps:
       - name: Checkout

Package.swift

@@ -10,7 +10,7 @@ let package = Package(
             targets: ["CameraViewPlugin"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.2.0")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.4.2")
     ],
     targets: [
         .target(

android/src/main/java/com/michaelwolz/capacitorcameraview/CameraView.kt

@@ -19,6 +19,7 @@ import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageCapture
 import androidx.camera.core.ImageCaptureException
 import androidx.camera.core.ImageProxy
+import androidx.camera.core.TorchState
 import androidx.camera.core.resolutionselector.AspectRatioStrategy
 import androidx.camera.core.resolutionselector.ResolutionSelector
 import androidx.camera.mlkit.vision.MlKitAnalyzer
@@ -55,7 +56,6 @@ class CameraView(plugin: Plugin) {
     // Camera state
     private var currentCameraSelector = CameraSelector.DEFAULT_BACK_CAMERA
     private var currentFlashMode: Int = ImageCapture.FLASH_MODE_OFF
-    private var isTorchEnabled: Boolean = false
 
     // Plugin context
     private var lifecycleOwner: LifecycleOwner? = null
@@ -416,8 +416,16 @@ class CameraView(plugin: Plugin) {
     }
 
     /** Get the current torch mode */
-    fun getTorchMode(): Boolean {
-        return isTorchEnabled
+    fun getTorchMode(callback: (Boolean) -> Unit) {
+        mainHandler.post {
+            val cameraInfo = cameraController?.cameraInfo
+                ?: run {
+                    callback(false)
+                    return@post
+                }
+
+            callback(cameraInfo.torchState.value == TorchState.ON)
+        }
     }
 
     /** Set the torch mode */
@@ -437,7 +445,6 @@ class CameraView(plugin: Plugin) {
                 }
 
                 controller.cameraControl?.enableTorch(enabled)
-                isTorchEnabled = enabled
                 callback?.invoke(null)
             } catch (e: Exception) {
                 callback?.invoke(e)

android/src/main/java/com/michaelwolz/capacitorcameraview/CameraViewPlugin.kt

@@ -220,8 +220,7 @@ class CameraViewPlugin : Plugin() {
 
     @PluginMethod
     fun getTorchMode(call: PluginCall) {
-        try {
-            val enabled = implementation.getTorchMode()
+        implementation.getTorchMode { enabled ->
             call.resolve(JSObject().apply {
                 put("enabled", enabled)
                 put(
@@ -230,8 +229,6 @@ class CameraViewPlugin : Plugin() {
                     if (enabled) 1.0f else 0.0f
                 )
             })
-        } catch (e: Exception) {
-            call.reject("Failed to get torch mode: ${e.localizedMessage}", e)
         }
     }
 

example-app/src/app/components/camera-modal/camera-modal.component.ts

@@ -177,6 +177,7 @@ export class CameraModalComponent implements OnInit, OnDestroy {
     ]);
 
     this.currentZoomFactor.set(this.initialZoomFactor());
+    await this.#debugCurrentTorchState();
   }
 
   protected async stopCamera(): Promise<void> {
@@ -185,6 +186,8 @@ export class CameraModalComponent implements OnInit, OnDestroy {
     } catch (error) {
       console.error('Failed to stop camera', error);
     }
+
+    await this.#debugCurrentTorchState();
   }
 
   protected async close(): Promise<void> {
@@ -267,7 +270,6 @@ export class CameraModalComponent implements OnInit, OnDestroy {
   }
 
   protected async flipCamera(): Promise<void> {
-    debugger;
     try {
       await this.#cameraViewService.flipCamera();
 
@@ -408,6 +410,8 @@ export class CameraModalComponent implements OnInit, OnDestroy {
     } catch (error) {
       console.error('Failed to toggle torch', error);
     }
+
+    await this.#debugCurrentTorchState();
   }
 
   async #toggleTorchIos(): Promise<void> {
@@ -447,4 +451,12 @@ export class CameraModalComponent implements OnInit, OnDestroy {
     // Android: 100% when on, 0% when off
     this.torchLevel.set(enabled ? 1.0 : 0.0);
   }
+
+  /**
+   * Helper method for checking current torch state
+   */
+  async #debugCurrentTorchState(): Promise<void> {
+    const currentState = await this.#cameraViewService.getTorchMode();
+    console.debug('Current torch state:', currentState);
+  }
 }

ios/Sources/CameraViewPlugin/CameraViewManager.swift

@@ -29,10 +29,6 @@ internal let SUPPORTED_CAMERA_DEVICE_TYPES: [AVCaptureDevice.DeviceType] = [
     /// Currently selected flash mode.
     private var flashMode: AVCaptureDevice.FlashMode = .auto
 
-    /// Currently selected torch mode and level.
-    private var torchEnabled: Bool = false
-    private var torchLevel: Float = 1.0
-
     /// Reference to the blur overlay view that is shown when switching to the triple camera in order to have a smooth transition
     private var blurOverlayView: UIVisualEffectView?
 
@@ -248,7 +244,12 @@ internal let SUPPORTED_CAMERA_DEVICE_TYPES: [AVCaptureDevice.DeviceType] = [
     ///
     /// - Returns: A tuple containing the torch enabled state and level
     public func getTorchMode() -> (enabled: Bool, level: Float) {
-        return (torchEnabled, torchLevel)
+        guard let camera = currentCameraDevice else { return (false, 0.0) }
+
+        let isEnabled = camera.torchMode == .on
+        let level = camera.torchLevel
+
+        return (isEnabled, level)
     }
 
     /// Sets the torch mode and level for the currently active camera device.
@@ -270,9 +271,6 @@ internal let SUPPORTED_CAMERA_DEVICE_TYPES: [AVCaptureDevice.DeviceType] = [
             } else {
                 camera.torchMode = .off
             }
-
-            torchEnabled = enabled && level > 0.0
-            torchLevel = level
         } catch {
             throw CameraError.configurationFailed(error)
         }