capacitor-plugin-camera-forked 3.0.94 → 3.0.96

package/android/src/main/java/com/tonyxlh/capacitor/camera/CameraPreviewPlugin.java

@@ -350,8 +350,12 @@ public class CameraPreviewPlugin extends Plugin {
                         return;
                     }
                     if (useCaseGroup == null) {
-                        call.reject("Camera use cases not initialized");
-                        return;
+                        // Re-initialize use cases if they were cleared
+                        setupUseCases(false);
+                        if (useCaseGroup == null) {
+                            call.reject("Camera use cases not initialized");
+                            return;
+                        }
                     }
                     if (previewView == null) {
                         call.reject("Preview view not initialized");
@@ -412,9 +416,22 @@ public class CameraPreviewPlugin extends Plugin {
             public void run() {
                 try {
                     restoreWebViewBackground();
-                    previewView.setVisibility(View.INVISIBLE);
-                    previewView.setBackgroundColor(Color.BLACK);
-                    cameraProvider.unbindAll();
+                    if (previewView != null) {
+                        previewView.setVisibility(View.INVISIBLE);
+                        previewView.setBackgroundColor(Color.BLACK);
+                    }
+                    if (cameraProvider != null) {
+                        cameraProvider.unbindAll();
+                    }
+                    // Null out references to help GC and ensure release
+                    camera = null;
+                    imageCapture = null;
+                    preview = null;
+                    imageAnalysis = null;
+                    useCaseGroup = null;
+                    recorder = null;
+                    currentRecording = null;
+                    Log.d("Camera", "Camera stopped and all references cleared.");
                     call.resolve();
                 } catch (Exception e) {
                     call.reject(e.getMessage());
@@ -525,7 +542,7 @@ public class CameraPreviewPlugin extends Plugin {
                 
             } catch (Exception e) {
                 e.printStackTrace();
-                call.reject(e.getMessage());
+                call.resolve();
             }
         }
         call.resolve();
@@ -533,22 +550,34 @@ public class CameraPreviewPlugin extends Plugin {
 
     @PluginMethod
     public void setFocus(PluginCall call) {
+        
+        JSObject response = new JSObject();
         if (!call.hasOption("x") || !call.hasOption("y")) {
-        call.reject("Invalid focus coordinates - x and y are required");
+            response.put("success", false);
+            call.resolve(response);
         return;
         }
 
         Float x = call.getFloat("x");
         Float y = call.getFloat("y");
 
+        // Check for null values
+        if (x == null || y == null) {
+            response.put("success", false);
+            call.resolve(response);
+            return;
+        }
+
         // Validate coordinate ranges (should be 0-1 for normalized coordinates)
         if (x < 0.0f || x > 1.0f || y < 0.0f || y > 1.0f) {
-        call.reject("Focus coordinates must be normalized values between 0.0 and 1.0");
+        response.put("success", false);
+        call.resolve(response);
         return;
         }
 
         if (previewView == null || camera == null) {
-          call.reject("Camera preview is not initialized");
+          response.put("success", false);
+          call.resolve(response);
           return;
         }
 
@@ -617,7 +646,9 @@ public class CameraPreviewPlugin extends Plugin {
 
             } catch (Exception e) {
             Log.e("Camera", "Error setting focus", e);
-            call.reject("Error setting focus: " + e.getMessage());
+            response.put("success", false);
+            response.put("error", e.getMessage());
+            call.resolve(response);
             }
         }
         });
@@ -1222,12 +1253,21 @@ public class CameraPreviewPlugin extends Plugin {
 
     @Override
     protected void handleOnPause() {
-        if (camera != null) {
+        if (camera != null && cameraProvider != null) {
             CameraState cameraStatus = camera.getCameraInfo().getCameraState().getValue();
             previousCameraStatus = cameraStatus;
             if (cameraStatus.getType() == CameraState.Type.OPEN) {
                 cameraProvider.unbindAll();
             }
+            // Null out references
+            camera = null;
+            imageCapture = null;
+            preview = null;
+            imageAnalysis = null;
+            useCaseGroup = null;
+            recorder = null;
+            currentRecording = null;
+            Log.d("Camera", "handleOnPause: Camera stopped and references cleared.");
         }
         super.handleOnPause();
     }
@@ -1306,4 +1346,4 @@ public class CameraPreviewPlugin extends Plugin {
         call.resolve(result);
     }
 
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-plugin-camera-forked",
-  "version": "3.0.94",
+  "version": "3.0.96",
   "description": "A capacitor camera plugin - A custom Capacitor camera plugin with additional features.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",