capacitor-community-multilens-camerapreview 6.0.4 → 6.1.0

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

@@ -62,6 +62,7 @@ public class CameraActivity extends Fragment {
         void onStartRecordVideoError(String message);
         void onStopRecordVideo(String file);
         void onStopRecordVideoError(String error);
+        void setSavePath(String path);
     }
 
     private CameraPreviewListener eventListener;
@@ -558,18 +559,12 @@ public class CameraActivity extends Fragment {
                         data = outputStream.toByteArray();
                     }
                 }
-
-                if (!storeToFile) {
-                    String encodedImage = Base64.encodeToString(data, Base64.NO_WRAP);
-
-                    eventListener.onPictureTaken(encodedImage);
-                } else {
-                    String path = getTempFilePath();
-                    FileOutputStream out = new FileOutputStream(path);
-                    out.write(data);
-                    out.close();
-                    eventListener.onPictureTaken(path);
+                String encodedImage = Base64.encodeToString(data, Base64.NO_WRAP);
+                if (storeToFile) {
+                    writeImageToCache(data);
                 }
+                eventListener.onPictureTaken(encodedImage);
+
                 Log.d(TAG, "CameraPreview pictureTakenHandler called back");
             } catch (OutOfMemoryError e) {
                 // most likely failed to allocate memory for rotateBitmap
@@ -588,6 +583,20 @@ public class CameraActivity extends Fragment {
         }
     };
 
+    private void writeImageToCache(byte[] data){
+        try {
+            String path = getTempFilePath();
+            FileOutputStream out = new FileOutputStream(path);
+            out.write(data);
+            out.close();
+            eventListener.setSavePath(path);
+        } catch (Exception e) {
+            // TODO: handle exception
+            Log.d(TAG, "cannot write image");
+        }
+        
+    }
+
     private Camera.Size getOptimalPictureSize(
         final int width,
         final int height,

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

@@ -52,6 +52,9 @@ public class CameraPreviewMultiLens extends Plugin implements CameraActivity.Cam
     private int containerViewId = 21;
     private int zoomLevel = 0;
 
+    private String savePath = null;
+    private String saveData = null;
+
     @PluginMethod
     public void echo(PluginCall call) {
         String value = call.getString("value");
@@ -431,7 +434,23 @@ public class CameraPreviewMultiLens extends Plugin implements CameraActivity.Cam
     public void onPictureTaken(String originalPicture) {
         JSObject jsObject = new JSObject();
         jsObject.put("value", originalPicture);
-        bridge.getSavedCall(captureCallbackId).resolve(jsObject);
+        if(fragment.storeToFile){
+            saveData = originalPicture;
+        } else {
+            bridge.getSavedCall(captureCallbackId).resolve(jsObject);
+        }
+    }
+    @Override
+    public void setSavePath(String path) {
+        JSObject jsObject = new JSObject();
+        jsObject.put("value", saveData);
+        jsObject.put("webPath", "file://" + path);
+        if(fragment.storeToFile){
+            bridge.getSavedCall(captureCallbackId).resolve(jsObject);
+        }
+        saveData = null;
+        savePath = null;
+
     }
 
     @Override

package/dist/esm/definitions.d.ts

@@ -61,9 +61,7 @@ export interface CameraPreviewMultiLensPlugin {
     startRecordVideo(options: CameraPreviewOptions): Promise<{}>;
     stop(): Promise<{}>;
     stopRecordVideo(): Promise<{}>;
-    capture(options: CameraPreviewPictureOptions): Promise<{
-        value: string;
-    }>;
+    capture(options: CameraPreviewPictureOptions): Promise<any>;
     captureSample(options: CameraSampleOptions): Promise<{
         value: string;
     }>;

package/package.json

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