capacitor-community-multilens-camerapreview 7.1.8 → 7.1.901

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

@@ -300,9 +300,6 @@ public class CameraActivity extends Fragment {
             StreamConfigurationMap map = cameraCharacteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
             cameraSensorOrientation = cameraCharacteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
 
-            mPreview.setCamera(null, 0);
-            mPreview.setCameraDisplayOrientation();
-
             cameraManager.openCamera(defaultCameraId, cameraStateCallback, null);
         } catch (CameraAccessException | SecurityException e) {
             Log.e(TAG, "Failed to open camera: " + e.getMessage());
@@ -325,6 +322,8 @@ public class CameraActivity extends Fragment {
         @Override
         public void onOpened(CameraDevice device) {
             cameraDevice = device;
+            mPreview.setCamera(cameraDevice, Integer.parseInt(defaultCameraId));
+            mPreview.setCameraDisplayOrientation();
             createCameraPreviewSession();
         }
 
@@ -547,9 +546,8 @@ public class CameraActivity extends Fragment {
             }
 
             ImageReader imageReader = ImageReader.newInstance(jpegSize.getWidth(), jpegSize.getHeight(), ImageFormat.JPEG, 1);
-            List<Surface> outputSurfaces = new ArrayList<>(2);
+            List<Surface> outputSurfaces = new ArrayList<>(1);
             outputSurfaces.add(imageReader.getSurface());
-            outputSurfaces.add(mPreview.getSurface());
 
             final CaptureRequest.Builder captureBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
             captureBuilder.addTarget(imageReader.getSurface());
@@ -614,9 +612,8 @@ public class CameraActivity extends Fragment {
             }
 
             ImageReader imageReader = ImageReader.newInstance(jpegSize.getWidth(), jpegSize.getHeight(), ImageFormat.JPEG, 1);
-            List<Surface> outputSurfaces = new ArrayList<>(2);
+            List<Surface> outputSurfaces = new ArrayList<>(1);
             outputSurfaces.add(imageReader.getSurface());
-            outputSurfaces.add(mPreview.getSurface());
 
             final CaptureRequest.Builder captureBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
             captureBuilder.addTarget(imageReader.getSurface());

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

@@ -478,8 +478,10 @@ public class CameraPreviewMultiLens extends Plugin implements CameraActivity.Cam
     @Override
     public void onCameraStarted() {
         PluginCall pluginCall = bridge.getSavedCall(cameraStartCallbackId);
-        pluginCall.resolve();
-        bridge.releaseCall(pluginCall);
+        if (pluginCall != null) {
+            pluginCall.resolve();
+            bridge.releaseCall(pluginCall);
+        }
     }
 
     @Override

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

@@ -211,7 +211,15 @@ class Preview extends RelativeLayout implements SurfaceHolder.Callback, TextureV
     }
 
     public Surface getSurface() {
-        return null;
+        if (!enableOpacity) {
+            return mHolder.getSurface();
+        } else {
+            if (mSurfaceTexture != null) {
+                return new Surface(mSurfaceTexture);
+            } else {
+                return null;
+            }
+        }
     }
 
     @Override

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-community-multilens-camerapreview",
-  "version": "7.1.8",
+  "version": "7.1.901",
   "description": "fork of capacitor community camera preview with support for switchting lenses",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",