@capgo/camera-preview 4.0.0 → 5.0.1

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

@@ -1,6 +1,7 @@
 package com.ahm.capacitor.camera.preview;
 
 import static android.Manifest.permission.CAMERA;
+import static android.Manifest.permission.RECORD_AUDIO;
 
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
@@ -15,6 +16,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
+import androidx.annotation.NonNull;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Logger;
 import com.getcapacitor.PermissionState;
@@ -26,13 +28,14 @@ import com.getcapacitor.annotation.Permission;
 import com.getcapacitor.annotation.PermissionCallback;
 import java.io.File;
 import java.util.List;
+import java.util.Objects;
 import org.json.JSONArray;
 
 @CapacitorPlugin(
   name = "CameraPreview",
   permissions = {
     @Permission(
-      strings = { CAMERA },
+      strings = { CAMERA, RECORD_AUDIO },
       alias = CameraPreview.CAMERA_PERMISSION_ALIAS
     ),
   }
@@ -44,7 +47,7 @@ public class CameraPreview
   static final String CAMERA_PERMISSION_ALIAS = "camera";
 
   private static String VIDEO_FILE_PATH = "";
-  private static String VIDEO_FILE_EXTENSION = ".mp4";
+  private static final String VIDEO_FILE_EXTENSION = ".mp4";
 
   private String captureCallbackId = "";
   private String snapshotCallbackId = "";
@@ -52,10 +55,11 @@ public class CameraPreview
   private String cameraStartCallbackId = "";
 
   // keep track of previously specified orientation to support locking orientation:
-  private int previousOrientationRequest = -1;
+  private int previousOrientationRequest =
+    ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
 
   private CameraActivity fragment;
-  private int containerViewId = 20;
+  private final int containerViewId = 20;
 
   @PluginMethod
   public void start(PluginCall call) {
@@ -87,42 +91,42 @@ public class CameraPreview
 
   @PluginMethod
   public void setOpacity(PluginCall call) {
-    if (this.hasCamera(call) == false) {
+    if (!this.hasCamera(call)) {
       call.error("Camera is not running");
       return;
     }
 
     bridge.saveCall(call);
-    Float opacity = call.getFloat("opacity", 1F);
+    Float opacity = Objects.requireNonNull(call.getFloat("opacity", 1F));
     fragment.setOpacity(opacity);
   }
 
   @PluginMethod
   public void capture(PluginCall call) {
-    if (this.hasCamera(call) == false) {
+    if (!this.hasCamera(call)) {
       call.reject("Camera is not running");
       return;
     }
     bridge.saveCall(call);
     captureCallbackId = call.getCallbackId();
 
-    Integer quality = call.getInt("quality", 85);
+    Integer quality = Objects.requireNonNull(call.getInt("quality", 85));
     // Image Dimensions - Optional
-    Integer width = call.getInt("width", 0);
-    Integer height = call.getInt("height", 0);
+    Integer width = Objects.requireNonNull(call.getInt("width", 0));
+    Integer height = Objects.requireNonNull(call.getInt("height", 0));
     fragment.takePicture(width, height, quality);
   }
 
   @PluginMethod
   public void captureSample(PluginCall call) {
-    if (this.hasCamera(call) == false) {
+    if (!this.hasCamera(call)) {
       call.reject("Camera is not running");
       return;
     }
     bridge.saveCall(call);
     snapshotCallbackId = call.getCallbackId();
 
-    Integer quality = call.getInt("quality", 85);
+    Integer quality = Objects.requireNonNull(call.getInt("quality", 85));
     fragment.takeSnapshot(quality);
   }
 
@@ -167,7 +171,7 @@ public class CameraPreview
 
   @PluginMethod
   public void getSupportedFlashModes(PluginCall call) {
-    if (this.hasCamera(call) == false) {
+    if (!this.hasCamera(call)) {
       call.reject("Camera is not running");
       return;
     }
@@ -180,7 +184,7 @@ public class CameraPreview
 
     if (supportedFlashModes != null) {
       for (int i = 0; i < supportedFlashModes.size(); i++) {
-        jsonFlashModes.put(new String(supportedFlashModes.get(i)));
+        jsonFlashModes.put(supportedFlashModes.get(i));
       }
     }
 
@@ -191,7 +195,7 @@ public class CameraPreview
 
   @PluginMethod
   public void getHorizontalFov(PluginCall call) {
-    if (this.hasCamera(call) == false) {
+    if (!this.hasCamera(call)) {
       call.reject("Camera is not running");
       return;
     }
@@ -208,13 +212,13 @@ public class CameraPreview
 
   @PluginMethod
   public void setFlashMode(PluginCall call) {
-    if (this.hasCamera(call) == false) {
+    if (!this.hasCamera(call)) {
       call.reject("Camera is not running");
       return;
     }
 
     String flashMode = call.getString("flashMode");
-    if (flashMode == null || flashMode.isEmpty() == true) {
+    if (flashMode == null || flashMode.isEmpty()) {
       call.reject("flashMode required parameter is missing");
       return;
     }
@@ -225,7 +229,7 @@ public class CameraPreview
     List<String> supportedFlashModes;
     supportedFlashModes = camera.getParameters().getSupportedFlashModes();
     if (
-      supportedFlashModes != null && supportedFlashModes.indexOf(flashMode) > -1
+      supportedFlashModes != null && supportedFlashModes.contains(flashMode)
     ) {
       params.setFlashMode(flashMode);
     } else {
@@ -240,19 +244,25 @@ public class CameraPreview
 
   @PluginMethod
   public void startRecordVideo(final PluginCall call) {
-    if (this.hasCamera(call) == false) {
+    if (!this.hasCamera(call)) {
       call.reject("Camera is not running");
       return;
     }
     final String filename = "videoTmp";
     VIDEO_FILE_PATH = getActivity().getCacheDir().toString() + "/";
 
-    final String position = call.getString("position", "front");
-    final Integer width = call.getInt("width", 0);
-    final Integer height = call.getInt("height", 0);
-    final Boolean withFlash = call.getBoolean("withFlash", false);
-    final Integer maxDuration = call.getInt("maxDuration", 0);
-    // final Integer quality = call.getInt("quality", 0);
+    final String position = Objects.requireNonNull(
+      call.getString("position", "front")
+    );
+    final Integer width = Objects.requireNonNull(call.getInt("width", 0));
+    final Integer height = Objects.requireNonNull(call.getInt("height", 0));
+    final Boolean withFlash = Objects.requireNonNull(
+      call.getBoolean("withFlash", false)
+    );
+    final Integer maxDuration = Objects.requireNonNull(
+      call.getInt("maxDuration", 0)
+    );
+    // final Integer quality = Objects.requireNonNull(call.getInt("quality", 0));
     bridge.saveCall(call);
     recordCallbackId = call.getCallbackId();
 
@@ -262,9 +272,8 @@ public class CameraPreview
         new Runnable() {
           @Override
           public void run() {
-            // fragment.startRecord(getFilePath(filename), position, width, height, quality, withFlash);
             fragment.startRecord(
-              getFilePath(filename),
+              getFilePath(),
               position,
               width,
               height,
@@ -281,7 +290,7 @@ public class CameraPreview
 
   @PluginMethod
   public void stopRecordVideo(PluginCall call) {
-    if (this.hasCamera(call) == false) {
+    if (!this.hasCamera(call)) {
       call.reject("Camera is not running");
       return;
     }
@@ -329,25 +338,39 @@ public class CameraPreview
       position = "front";
     }
 
-    final Integer x = call.getInt("x", 0);
-    final Integer y = call.getInt("y", 0);
-    final Integer width = call.getInt("width", 0);
-    final Integer height = call.getInt("height", 0);
-    final Integer paddingBottom = call.getInt("paddingBottom", 0);
-    final Boolean toBack = call.getBoolean("toBack", false);
-    final Boolean storeToFile = call.getBoolean("storeToFile", false);
-    final Boolean enableOpacity = call.getBoolean("enableOpacity", false);
-    final Boolean enableZoom = call.getBoolean("enableZoom", false);
-    final Boolean disableExifHeaderStripping = call.getBoolean(
-      "disableExifHeaderStripping",
-      true
+    @NonNull
+    final Integer x = Objects.requireNonNull(call.getInt("x", 0));
+    @NonNull
+    final Integer y = Objects.requireNonNull(call.getInt("y", 0));
+    @NonNull
+    final Integer width = Objects.requireNonNull(call.getInt("width", 0));
+    @NonNull
+    final Integer height = Objects.requireNonNull(call.getInt("height", 0));
+    @NonNull
+    final Integer paddingBottom = Objects.requireNonNull(
+      call.getInt("paddingBottom", 0)
+    );
+    final Boolean toBack = Objects.requireNonNull(
+      call.getBoolean("toBack", false)
+    );
+    final Boolean storeToFile = Objects.requireNonNull(
+      call.getBoolean("storeToFile", false)
+    );
+    final Boolean enableOpacity = Objects.requireNonNull(
+      call.getBoolean("enableOpacity", false)
     );
-    final Boolean lockOrientation = call.getBoolean(
-      "lockAndroidOrientation",
-      false
+    final Boolean enableZoom = Objects.requireNonNull(
+      call.getBoolean("enableZoom", false)
     );
-    previousOrientationRequest =
-      getBridge().getActivity().getRequestedOrientation();
+    final Boolean disableExifHeaderStripping = Objects.requireNonNull(
+      call.getBoolean("disableExifHeaderStripping", false)
+    );
+    final Boolean lockOrientation = Objects.requireNonNull(
+      call.getBoolean("lockAndroidOrientation", false)
+    );
+    previousOrientationRequest = getBridge()
+      .getActivity()
+      .getRequestedOrientation();
 
     fragment = new CameraActivity();
     fragment.setEventListener(this);
@@ -398,23 +421,21 @@ public class CameraPreview
             int computedPaddingBottom;
 
             if (paddingBottom != 0) {
-              computedPaddingBottom =
-                (int) TypedValue.applyDimension(
-                  TypedValue.COMPLEX_UNIT_DIP,
-                  paddingBottom,
-                  metrics
-                );
+              computedPaddingBottom = (int) TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP,
+                paddingBottom,
+                metrics
+              );
             } else {
               computedPaddingBottom = 0;
             }
 
             if (width != 0) {
-              computedWidth =
-                (int) TypedValue.applyDimension(
-                  TypedValue.COMPLEX_UNIT_DIP,
-                  width,
-                  metrics
-                );
+              computedWidth = (int) TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP,
+                width,
+                metrics
+              );
             } else {
               Display defaultDisplay = getBridge()
                 .getActivity()
@@ -423,22 +444,20 @@ public class CameraPreview
               final Point size = new Point();
               defaultDisplay.getSize(size);
 
-              computedWidth =
-                (int) TypedValue.applyDimension(
-                  TypedValue.COMPLEX_UNIT_PX,
-                  size.x,
-                  metrics
-                );
+              computedWidth = (int) TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_PX,
+                size.x,
+                metrics
+              );
             }
 
             if (height != 0) {
-              computedHeight =
-                (int) TypedValue.applyDimension(
-                  TypedValue.COMPLEX_UNIT_DIP,
-                  height,
-                  metrics
-                ) -
-                computedPaddingBottom;
+              computedHeight = (int) TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP,
+                height,
+                metrics
+              ) -
+              computedPaddingBottom;
             } else {
               Display defaultDisplay = getBridge()
                 .getActivity()
@@ -447,13 +466,12 @@ public class CameraPreview
               final Point size = new Point();
               defaultDisplay.getSize(size);
 
-              computedHeight =
-                (int) TypedValue.applyDimension(
-                  TypedValue.COMPLEX_UNIT_PX,
-                  size.y,
-                  metrics
-                ) -
-                computedPaddingBottom;
+              computedHeight = (int) TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_PX,
+                size.y,
+                metrics
+              ) -
+              computedPaddingBottom;
             }
 
             fragment.setRect(
@@ -467,15 +485,16 @@ public class CameraPreview
               .getActivity()
               .findViewById(containerViewId);
             if (containerView == null) {
-              containerView =
-                new FrameLayout(getActivity().getApplicationContext());
+              containerView = new FrameLayout(
+                getActivity().getApplicationContext()
+              );
               containerView.setId(containerViewId);
 
               getBridge().getWebView().setBackgroundColor(Color.TRANSPARENT);
               ((ViewGroup) getBridge().getWebView().getParent()).addView(
                   containerView
                 );
-              if (toBack == true) {
+              if (toBack) {
                 getBridge()
                   .getWebView()
                   .getParent()
@@ -582,7 +601,7 @@ public class CameraPreview
   }
 
   private boolean hasCamera(PluginCall call) {
-    if (this.hasView(call) == false) {
+    if (!this.hasView(call)) {
       return false;
     }
 
@@ -593,8 +612,8 @@ public class CameraPreview
     return true;
   }
 
-  private String getFilePath(String filename) {
-    String fileName = filename;
+  private String getFilePath() {
+    String fileName = "videoTmp";
 
     int i = 1;
 
@@ -602,7 +621,7 @@ public class CameraPreview
       new File(VIDEO_FILE_PATH + fileName + VIDEO_FILE_EXTENSION).exists()
     ) {
       // Add number suffix if file exists
-      fileName = filename + '_' + i;
+      fileName = "videoTmp" + '_' + i;
       i++;
     }
 
@@ -619,7 +638,11 @@ public class CameraPreview
         new View.OnTouchListener() {
           @Override
           public boolean onTouch(View v, MotionEvent event) {
-            if ((null != fragment) && (fragment.toBack == true)) {
+            if (
+              (null != fragment) &&
+              (fragment.toBack == true) &&
+              null != fragment.frameContainerLayout
+            ) {
               fragment.frameContainerLayout.dispatchTouchEvent(event);
             }
             return false;

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

@@ -3,6 +3,7 @@ package com.ahm.capacitor.camera.preview;
 import android.content.Context;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
+import androidx.annotation.NonNull;
 
 class CustomSurfaceView extends SurfaceView implements SurfaceHolder.Callback {
 
@@ -13,16 +14,16 @@ class CustomSurfaceView extends SurfaceView implements SurfaceHolder.Callback {
   }
 
   @Override
-  public void surfaceCreated(SurfaceHolder holder) {}
+  public void surfaceCreated(@NonNull SurfaceHolder holder) {}
 
   @Override
   public void surfaceChanged(
-    SurfaceHolder holder,
+    @NonNull SurfaceHolder holder,
     int format,
     int width,
     int height
   ) {}
 
   @Override
-  public void surfaceDestroyed(SurfaceHolder holder) {}
+  public void surfaceDestroyed(@NonNull SurfaceHolder holder) {}
 }

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

@@ -2,8 +2,8 @@ package com.ahm.capacitor.camera.preview;
 
 import android.content.Context;
 import android.graphics.SurfaceTexture;
-import android.view.SurfaceHolder;
 import android.view.TextureView;
+import androidx.annotation.NonNull;
 
 class CustomTextureView
   extends TextureView
@@ -17,23 +17,23 @@ class CustomTextureView
 
   @Override
   public void onSurfaceTextureAvailable(
-    SurfaceTexture surface,
+    @NonNull SurfaceTexture surface,
     int width,
     int height
   ) {}
 
   @Override
   public void onSurfaceTextureSizeChanged(
-    SurfaceTexture surface,
+    @NonNull SurfaceTexture surface,
     int width,
     int height
   ) {}
 
   @Override
-  public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+  public boolean onSurfaceTextureDestroyed(@NonNull SurfaceTexture surface) {
     return true;
   }
 
   @Override
-  public void onSurfaceTextureUpdated(SurfaceTexture surface) {}
+  public void onSurfaceTextureUpdated(@NonNull SurfaceTexture surface) {}
 }

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

@@ -67,8 +67,9 @@ class Preview
     if (camera != null) {
       mCamera = camera;
       this.cameraId = cameraId;
-      mSupportedPreviewSizes =
-        mCamera.getParameters().getSupportedPreviewSizes();
+      mSupportedPreviewSizes = mCamera
+        .getParameters()
+        .getSupportedPreviewSizes();
       setCameraDisplayOrientation();
 
       List<String> mFocusModes = mCamera
@@ -84,6 +85,12 @@ class Preview
         params.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
       }
       mCamera.setParameters(params);
+    } else {
+      // Release the camera and set it to null when the camera parameter is null
+      if (mCamera != null) {
+        mCamera.release();
+        mCamera = null;
+      }
     }
   }
 
@@ -154,9 +161,9 @@ class Preview
     Log.d(TAG, "screen is rotated " + degrees + "deg from natural");
     Log.d(
       TAG,
-      (
-        info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" : "back"
-      ) +
+      (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT
+          ? "front"
+          : "back") +
       " camera is oriented -" +
       info.orientation +
       "deg from natural"
@@ -187,12 +194,11 @@ class Preview
       Log.d("CameraPreview", "before setPreviewSize");
 
       mSupportedPreviewSizes = parameters.getSupportedPreviewSizes();
-      mPreviewSize =
-        getOptimalPreviewSize(
-          mSupportedPreviewSizes,
-          v.getWidth(),
-          v.getHeight()
-        );
+      mPreviewSize = getOptimalPreviewSize(
+        mSupportedPreviewSizes,
+        v.getWidth(),
+        v.getHeight()
+      );
       parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height);
       Log.d(TAG, mPreviewSize.width + " " + mPreviewSize.height);
 
@@ -215,8 +221,11 @@ class Preview
     setMeasuredDimension(width, height);
 
     if (mSupportedPreviewSizes != null) {
-      mPreviewSize =
-        getOptimalPreviewSize(mSupportedPreviewSizes, width, height);
+      mPreviewSize = getOptimalPreviewSize(
+        mSupportedPreviewSizes,
+        width,
+        height
+      );
     }
   }
 
@@ -252,18 +261,18 @@ class Preview
       // Center the child SurfaceView within the parent.
       if (width * previewHeight < height * previewWidth) {
         Log.d(TAG, "center horizontally");
-        int scaledChildWidth = (int) (
-          (previewWidth * height / previewHeight) * scale
-        );
+        int scaledChildWidth = (int) (((previewWidth * height) /
+            previewHeight) *
+          scale);
         nW = (width + scaledChildWidth) / 2;
         nH = (int) (height * scale);
         top = 0;
         left = (width - scaledChildWidth) / 2;
       } else {
         Log.d(TAG, "center vertically");
-        int scaledChildHeight = (int) (
-          (previewHeight * width / previewWidth) * scale
-        );
+        int scaledChildHeight = (int) (((previewHeight * width) /
+            previewWidth) *
+          scale);
         nW = (int) (width * scale);
         nH = (height + scaledChildHeight) / 2;
         top = (height - scaledChildHeight) / 2;
@@ -355,12 +364,21 @@ class Preview
   }
 
   public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
+    Log.d(
+      TAG,
+      "Preview size in surfaceChanged: " +
+      mPreviewSize.width +
+      "x" +
+      mPreviewSize.height
+    );
+
     if (mCamera != null) {
       try {
         // Now that the size is known, set up the camera parameters and begin
         // the preview.
-        mSupportedPreviewSizes =
-          mCamera.getParameters().getSupportedPreviewSizes();
+        mSupportedPreviewSizes = mCamera
+          .getParameters()
+          .getSupportedPreviewSizes();
         if (mSupportedPreviewSizes != null) {
           mPreviewSize = getOptimalPreviewSize(mSupportedPreviewSizes, w, h);
         }
@@ -392,8 +410,11 @@ class Preview
     try {
       mSurface = surface;
       if (mSupportedPreviewSizes != null) {
-        mPreviewSize =
-          getOptimalPreviewSize(mSupportedPreviewSizes, width, height);
+        mPreviewSize = getOptimalPreviewSize(
+          mSupportedPreviewSizes,
+          width,
+          height
+        );
       }
       if (mCamera != null) {
         mTextureView.setAlpha(opacity);