@capgo/camera-preview 7.14.5 → 7.14.6

package/android/src/main/java/com/ahm/capacitor/camera/preview/CameraPreview.java

@@ -229,6 +229,15 @@ public class CameraPreview
 
   @PluginMethod
   public void start(PluginCall call) {
+    // Prevent starting while an existing view is still active or stopping
+    if (cameraXView != null) {
+      try {
+        if (cameraXView.isRunning() || cameraXView.isBusy()) {
+          call.reject("Camera is busy or stopping. Please retry shortly.");
+          return;
+        }
+      } catch (Exception ignored) {}
+    }
     boolean disableAudio = Boolean.TRUE.equals(
       call.getBoolean("disableAudio", true)
     );
@@ -367,9 +376,18 @@ public class CameraPreview
           rotationOverlay = null;
         }
 
-        if (cameraXView != null && cameraXView.isRunning()) {
-          cameraXView.stopSession();
-          cameraXView = null;
+        if (cameraXView != null) {
+          boolean willDefer = false;
+          try {
+            willDefer = cameraXView.isCapturing();
+          } catch (Exception ignored) {}
+          if (cameraXView.isRunning()) {
+            cameraXView.stopSession();
+          }
+          // Only drop the reference if no deferred stop is pending
+          if (!willDefer) {
+            cameraXView = null;
+          }
         }
         // Restore original window background if modified earlier
         if (originalWindowBackground != null) {
@@ -1486,6 +1504,12 @@ public class CameraPreview
     bridge.releaseCall(pluginCall);
   }
 
+  @Override
+  public void onCameraStopped() {
+    // Ensure reference is cleared once underlying CameraXView has fully stopped
+    cameraXView = null;
+  }
+
   private JSObject getViewSize(
     double x,
     double y,

package/android/src/main/java/com/ahm/capacitor/camera/preview/CameraXView.java

@@ -107,6 +107,7 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     void onSampleTakenError(String message);
     void onCameraStarted(int width, int height, int x, int y);
     void onCameraStartError(String message);
+    void onCameraStopped();
   }
 
   public interface VideoRecordingCallback {
@@ -144,6 +145,27 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
   private ListenableFuture<FocusMeteringResult> currentFocusFuture = null; // Track current focus operation
   private String currentExposureMode = "CONTINUOUS"; // Default behavior
   private boolean isVideoCaptureInitializing = false;
+  // Capture/stop coordination
+  private final Object captureLock = new Object();
+  private volatile boolean isCapturingPhoto = false;
+  private volatile boolean stopRequested = false;
+  private volatile boolean previewDetachedOnDeferredStop = false;
+
+  public boolean isCapturing() {
+    return isCapturingPhoto;
+  }
+
+  public boolean isStopDeferred() {
+    synchronized (captureLock) {
+      return isCapturingPhoto && stopRequested;
+    }
+  }
+
+  public boolean isBusy() {
+    synchronized (captureLock) {
+      return isCapturingPhoto || stopRequested;
+    }
+  }
 
   public CameraXView(Context context, WebView webView) {
     this.context = context;
@@ -257,6 +279,32 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
   }
 
   public void stopSession() {
+    // If a capture is in progress, defer heavy teardown until it completes.
+    synchronized (captureLock) {
+      if (isCapturingPhoto) {
+        stopRequested = true;
+        // Hide/detach the preview immediately so UI can close, but keep camera running
+        if (!previewDetachedOnDeferredStop) {
+          mainExecutor.execute(() -> {
+            try {
+              if (previewContainer != null) {
+                ViewGroup parent = (ViewGroup) previewContainer.getParent();
+                if (parent != null) {
+                  parent.removeView(previewContainer);
+                }
+              }
+              previewDetachedOnDeferredStop = true;
+            } catch (Exception ignored) {}
+          });
+        }
+        return;
+      }
+    }
+
+    performImmediateStop();
+  }
+
+  private void performImmediateStop() {
     isRunning = false;
     // Cancel any ongoing focus operation when stopping session
     if (currentFocusFuture != null && !currentFocusFuture.isDone()) {
@@ -265,15 +313,27 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     currentFocusFuture = null;
 
     mainExecutor.execute(() -> {
-      lifecycleRegistry.setCurrentState(Lifecycle.State.DESTROYED);
-      if (cameraProvider != null) {
-        cameraProvider.unbindAll();
-      }
-      lifecycleRegistry.setCurrentState(Lifecycle.State.DESTROYED);
-      if (cameraExecutor != null) {
-        cameraExecutor.shutdownNow();
+      try {
+        lifecycleRegistry.setCurrentState(Lifecycle.State.DESTROYED);
+        if (cameraProvider != null) {
+          cameraProvider.unbindAll();
+        }
+        lifecycleRegistry.setCurrentState(Lifecycle.State.DESTROYED);
+        if (cameraExecutor != null) {
+          cameraExecutor.shutdown();
+        }
+        removePreviewView();
+      } catch (Exception e) {
+        Log.w(TAG, "performImmediateStop: error during stop", e);
+      } finally {
+        stopRequested = false;
+        previewDetachedOnDeferredStop = false;
+        if (listener != null) {
+          try {
+            listener.onCameraStopped();
+          } catch (Exception ignored) {}
+        }
       }
-      removePreviewView();
     });
   }
 
@@ -1065,6 +1125,10 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
       return;
     }
 
+    synchronized (captureLock) {
+      isCapturingPhoto = true;
+    }
+
     File tempFile = new File(context.getCacheDir(), "temp_image.jpg");
     ImageCapture.OutputFileOptions outputFileOptions =
       new ImageCapture.OutputFileOptions.Builder(tempFile).build();
@@ -1081,6 +1145,13 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
               "Photo capture failed: " + exception.getMessage()
             );
           }
+          // End of capture lifecycle
+          synchronized (captureLock) {
+            isCapturingPhoto = false;
+            if (stopRequested) {
+              performImmediateStop();
+            }
+          }
         }
 
         @Override
@@ -1194,6 +1265,14 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
                 "Error processing image: " + e.getMessage()
               );
             }
+          } finally {
+            // End of capture lifecycle
+            synchronized (captureLock) {
+              isCapturingPhoto = false;
+              if (stopRequested) {
+                performImmediateStop();
+              }
+            }
           }
         }
       }

package/ios/Sources/CapgoCameraPreviewPlugin/CameraController.swift

@@ -80,6 +80,10 @@ class CameraController: NSObject {
     // Track output preparation status
     private var outputsPrepared: Bool = false
 
+    // Capture/stop coordination
+    var isCapturingPhoto: Bool = false
+    var stopRequestedAfterCapture: Bool = false
+
     var isUsingMultiLensVirtualCamera: Bool {
         guard let device = (currentCameraPosition == .rear) ? rearCamera : frontCamera else { return false }
         // A rear multi-lens virtual camera will have a min zoom of 1.0 but support wider angles
@@ -944,14 +948,27 @@ extension CameraController {
             }
         }
 
-        self.photoCaptureCompletionBlock = { (image, photoData, metadata, error) in
+        self.isCapturingPhoto = true
+
+        self.photoCaptureCompletionBlock = { [weak self] (image, photoData, metadata, error) in
+            guard let self = self else { return }
             if let error = error {
                 completion(nil, nil, nil, error)
+                // End capture lifecycle
+                self.isCapturingPhoto = false
+                if self.stopRequestedAfterCapture {
+                    DispatchQueue.main.async { self.cleanup(); self.stopRequestedAfterCapture = false }
+                }
                 return
             }
 
             guard let image = image else {
                 completion(nil, nil, nil, NSError(domain: "Camera", code: 0, userInfo: [NSLocalizedDescriptionKey: "Failed to capture image"]))
+                // End capture lifecycle
+                self.isCapturingPhoto = false
+                if self.stopRequestedAfterCapture {
+                    DispatchQueue.main.async { self.cleanup(); self.stopRequestedAfterCapture = false }
+                }
                 return
             }
 
@@ -980,6 +997,11 @@ extension CameraController {
             }
 
             completion(finalImage, photoData, metadata, nil)
+            // End capture lifecycle
+            self.isCapturingPhoto = false
+            if self.stopRequestedAfterCapture {
+                DispatchQueue.main.async { self.cleanup(); self.stopRequestedAfterCapture = false }
+            }
         }
 
         photoOutput.capturePhoto(with: settings, delegate: self)

package/ios/Sources/CapgoCameraPreviewPlugin/Plugin.swift

@@ -521,6 +521,11 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             call.reject("camera already started")
             return
         }
+        // Guard against starting while a deferred stop is pending due to in-flight capture
+        if self.cameraController.isCapturingPhoto || self.cameraController.stopRequestedAfterCapture {
+            call.reject("camera is stopping or busy, please retry shortly")
+            return
+        }
         self.isInitializing = true
 
         self.cameraPosition = call.getString("position") ?? "rear"
@@ -739,7 +744,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
 
         // UI operations must be on main thread
         DispatchQueue.main.async {
-            // Always attempt to stop and clean up, regardless of captureSession state
+            // If a photo capture is in-flight, defer cleanup until it finishes,
+            // but hide the preview immediately so UI can close.
             self.cameraController.removeGridOverlay()
             if let previewView = self.previewView {
                 previewView.removeFromSuperview()
@@ -749,14 +755,20 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             self.webView?.isOpaque = true
             self.isInitialized = false
             self.isInitializing = false
-            self.cameraController.cleanup()
 
-            // Remove notification observers
+            // Remove notification observers regardless
             NotificationCenter.default.removeObserver(self)
-
             NotificationCenter.default.removeObserver(self, name: UIDevice.orientationDidChangeNotification, object: nil)
             UIDevice.current.endGeneratingDeviceOrientationNotifications()
 
+            if self.cameraController.isCapturingPhoto {
+                // Defer heavy cleanup until capture callback completes
+                self.cameraController.stopRequestedAfterCapture = true
+            } else {
+                // No capture pending; cleanup now
+                self.cameraController.cleanup()
+            }
+
             call.resolve()
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/camera-preview",
-  "version": "7.14.5",
+  "version": "7.14.6",
   "description": "Camera preview",
   "license": "MIT",
   "repository": {