@carviz/capacitor-camera-preview 8.0.1 → 8.0.3

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

@@ -45,6 +45,7 @@ public class CameraActivity extends Fragment {
         void onSnapshotTakenError(String message);
         void onBackButton();
         void onCameraStarted();
+        void onCameraStartError(String message);
     }
 
     public interface ZoomChangeListener {
@@ -324,7 +325,16 @@ public class CameraActivity extends Fragment {
     public void onResume() {
         super.onResume();
 
-        mCamera = Camera.open(defaultCameraId);
+        try {
+            mCamera = Camera.open(defaultCameraId);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Failed to open camera on resume", e);
+            mCamera = null;
+            if (eventListener != null) {
+                eventListener.onCameraStartError(e.getMessage() != null ? e.getMessage() : "Failed to open camera");
+            }
+            return;
+        }
 
         if (cameraParameters != null) {
             mCamera.setParameters(cameraParameters);
@@ -789,25 +799,25 @@ public class CameraActivity extends Fragment {
 
     public void setFocusArea(final int pointX, final int pointY, final Camera.AutoFocusCallback callback) {
         if (mCamera != null) {
-            mCamera.cancelAutoFocus();
+            try {
+                mCamera.cancelAutoFocus();
 
-            Camera.Parameters parameters = mCamera.getParameters();
-            
-            // Store the original focus mode to restore it later
-            final String originalFocusMode = parameters.getFocusMode();
+                Camera.Parameters parameters = mCamera.getParameters();
 
-            Rect focusRect = calculateTapArea(pointX, pointY, 1f);
-            parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
-            parameters.setFocusAreas(Arrays.asList(new Camera.Area(focusRect, 1000)));
+                // Store the original focus mode to restore it later
+                final String originalFocusMode = parameters.getFocusMode();
 
-            if (parameters.getMaxNumMeteringAreas() > 0) {
-                Rect meteringRect = calculateTapArea(pointX, pointY, 1.5f);
-                parameters.setMeteringAreas(Arrays.asList(new Camera.Area(meteringRect, 1000)));
-            }
+                Rect focusRect = calculateTapArea(pointX, pointY, 1f);
+                parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
+                parameters.setFocusAreas(Arrays.asList(new Camera.Area(focusRect, 1000)));
+
+                if (parameters.getMaxNumMeteringAreas() > 0) {
+                    Rect meteringRect = calculateTapArea(pointX, pointY, 1.5f);
+                    parameters.setMeteringAreas(Arrays.asList(new Camera.Area(meteringRect, 1000)));
+                }
 
-            try {
                 setCameraParameters(parameters);
-                
+
                 // Wrap the callback to restore focus mode after autofocus completes
                 mCamera.autoFocus(new Camera.AutoFocusCallback() {
                     @Override

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

@@ -440,6 +440,19 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
         bridge.releaseCall(pluginCall);
     }
 
+    @Override
+    public void onCameraStartError(String message) {
+        PluginCall pluginCall = bridge.getSavedCall(cameraStartCallbackId);
+        if (pluginCall != null) {
+            pluginCall.reject(message);
+            bridge.releaseCall(pluginCall);
+            cameraStartCallbackId = "";
+        }
+        JSObject result = new JSObject();
+        result.put("message", message);
+        notifyListeners("cameraStartError", result);
+    }
+
     @Override
     public void onZoomChanged(float zoom) {
         JSObject result = new JSObject();
@@ -477,7 +490,7 @@ public class CameraPreview extends Plugin implements CameraActivity.CameraPrevie
                 new View.OnTouchListener() {
                     @Override
                     public boolean onTouch(View v, MotionEvent event) {
-                        if ((null != fragment) && (fragment.toBack == true)) {
+                        if (fragment != null && fragment.toBack && fragment.frameContainerLayout != null) {
                             fragment.frameContainerLayout.dispatchTouchEvent(event);
                         }
                         return false;

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

@@ -62,9 +62,9 @@ class Preview extends RelativeLayout implements SurfaceHolder.Callback, TextureV
     }
 
     public void setCamera(Camera camera, int cameraId) {
+        mCamera = camera;
+        this.cameraId = cameraId;
         if (camera != null) {
-            mCamera = camera;
-            this.cameraId = cameraId;
             mSupportedPreviewSizes = mCamera.getParameters().getSupportedPreviewSizes();
             setCameraDisplayOrientation();
 
@@ -101,46 +101,58 @@ class Preview extends RelativeLayout implements SurfaceHolder.Callback, TextureV
     }
 
     public void setCameraDisplayOrientation() {
-        Camera.CameraInfo info = new Camera.CameraInfo();
-        int rotation = ((Activity) getContext()).getWindowManager().getDefaultDisplay().getRotation();
-        int degrees = 0;
-        DisplayMetrics dm = new DisplayMetrics();
-
-        Camera.getCameraInfo(cameraId, info);
-        ((Activity) getContext()).getWindowManager().getDefaultDisplay().getMetrics(dm);
-
-        switch (rotation) {
-            case Surface.ROTATION_0:
-                degrees = 0;
-                break;
-            case Surface.ROTATION_90:
-                degrees = 90;
-                break;
-            case Surface.ROTATION_180:
-                degrees = 180;
-                break;
-            case Surface.ROTATION_270:
-                degrees = 270;
-                break;
-        }
-        facing = info.facing;
-        if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
-            displayOrientation = (info.orientation + degrees) % 360;
-            displayOrientation = (360 - displayOrientation) % 360;
-        } else {
-            displayOrientation = (info.orientation - degrees + 360) % 360;
+        if (mCamera == null) {
+            return;
         }
+        try {
+            Camera.CameraInfo info = new Camera.CameraInfo();
+            int rotation = ((Activity) getContext()).getWindowManager().getDefaultDisplay().getRotation();
+            int degrees = 0;
+            DisplayMetrics dm = new DisplayMetrics();
+
+            Camera.getCameraInfo(cameraId, info);
+            ((Activity) getContext()).getWindowManager().getDefaultDisplay().getMetrics(dm);
+
+            switch (rotation) {
+                case Surface.ROTATION_0:
+                    degrees = 0;
+                    break;
+                case Surface.ROTATION_90:
+                    degrees = 90;
+                    break;
+                case Surface.ROTATION_180:
+                    degrees = 180;
+                    break;
+                case Surface.ROTATION_270:
+                    degrees = 270;
+                    break;
+            }
+            facing = info.facing;
+            if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+                displayOrientation = (info.orientation + degrees) % 360;
+                displayOrientation = (360 - displayOrientation) % 360;
+            } else {
+                displayOrientation = (info.orientation - degrees + 360) % 360;
+            }
 
-        Log.d(TAG, "screen is rotated " + degrees + "deg from natural");
-        Log.d(
-            TAG,
-            (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" : "back") +
-            " camera is oriented -" +
-            info.orientation +
-            "deg from natural"
-        );
-        Log.d(TAG, "need to rotate preview " + displayOrientation + "deg");
-        mCamera.setDisplayOrientation(displayOrientation);
+            Log.d(TAG, "screen is rotated " + degrees + "deg from natural");
+            Log.d(
+                TAG,
+                (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" : "back") +
+                " camera is oriented -" +
+                info.orientation +
+                "deg from natural"
+            );
+            Log.d(TAG, "need to rotate preview " + displayOrientation + "deg");
+            mCamera.setDisplayOrientation(displayOrientation);
+        } catch (RuntimeException e) {
+            // The Camera1 handle can be released / mid-teardown / not yet fully opened when an
+            // orientation or configuration change arrives (screen-orientation lock/unlock, device
+            // rotation, or leaving the camera screen). In that state Camera.setDisplayOrientation()
+            // throws "set display orientation failed". Swallow it: the preview is either going away,
+            // or the orientation is re-applied by startCamera() on the next valid surface pass.
+            Log.e(TAG, "setCameraDisplayOrientation failed; camera in invalid state", e);
+        }
     }
 
     public void switchCamera(Camera camera, int cameraId) {
@@ -328,7 +340,10 @@ class Preview extends RelativeLayout implements SurfaceHolder.Callback, TextureV
         Camera.Parameters parameters = mCamera.getParameters();
         parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height);
         requestLayout();
-        //mCamera.setDisplayOrientation(90);
+        // Re-apply orientation on a camera just confirmed alive by getParameters() above. This
+        // self-heals if setCameraDisplayOrientation() was swallowed during a config-change race:
+        // a rotation resizes the surface, so surfaceChanged -> startCamera() runs here.
+        setCameraDisplayOrientation();
         mCamera.setParameters(parameters);
         mCamera.startPreview();
     }

package/dist/esm/definitions.d.ts

@@ -62,6 +62,10 @@ export interface CameraZoomChangeEvent {
     /** The new zoom level */
     zoom: number;
 }
+export interface CameraStartErrorEvent {
+    /** The error message from the native camera service */
+    message: string;
+}
 export interface CameraPreviewPosition {
     /** The x position in points (iOS) or dp (Android) */
     x: number;
@@ -125,6 +129,8 @@ export interface CameraPreviewPlugin {
     requestPermissions(): Promise<PermissionState>;
     /** Listen for zoom changes - Android / iOS only */
     addListener(eventName: 'zoomChanged', listenerFunc: (event: CameraZoomChangeEvent) => void): Promise<PluginListenerHandle>;
+    /** Listen for camera start failures (e.g. the camera service rejecting an open on resume) - Android only */
+    addListener(eventName: 'cameraStartError', listenerFunc: (event: CameraStartErrorEvent) => void): Promise<PluginListenerHandle>;
     /** Remove all listeners for this plugin */
     removeAllListeners(): Promise<void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carviz/capacitor-camera-preview",
-  "version": "8.0.1",
+  "version": "8.0.3",
   "description": "Fork of the capacitor-community/camera-preview plugin focusing on high resolution photos without bloating up the code.",
   "type": "module",
   "main": "dist/plugin.cjs.js",