capacitor-camera-module 0.0.36 → 0.0.38

package/android/src/main/java/com/eddieagvictoria/cameramodule/CameraModulePlugin.java

@@ -73,6 +73,9 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 import java.io.File;
 
+import androidx.exifinterface.media.ExifInterface;
+import java.io.FileInputStream;
+
 @CapacitorPlugin(
     name = "CameraModule",
     permissions = {
@@ -599,6 +602,7 @@ public class CameraModulePlugin extends Plugin {
                     ) {
                         try {
                             Bitmap bitmap = BitmapFactory.decodeFile(photoFile.getAbsolutePath());
+                            bitmap = rotateBitmapIfRequired(bitmap, photoFile);
                             Bitmap resized = resizeBitmap(bitmap, 1024);
 
                             ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -639,71 +643,69 @@ public class CameraModulePlugin extends Plugin {
     @PluginMethod
     public void startBarcodeScan(PluginCall call) {
 
-        if (previewView == null) {
-            call.reject("Preview not started");
-            return;
-        }
-
-        if (getPermissionState("camera") != PermissionState.GRANTED) {
-            call.reject("Camera permission not granted");
-            return;
-        }
-
-        if (cameraProvider == null) {
-            call.reject("Camera not initialized");
-            return;
-        }
+        getActivity().runOnUiThread(() -> {
 
-        if (isScanning) {
-            call.reject("Already scanning");
-            return;
-        }
+            if (previewView == null) {
+                call.reject("Preview not started");
+                return;
+            }
 
-         barcodeScanner = BarcodeScanning.getClient();
+            if (getPermissionState("camera") != PermissionState.GRANTED) {
+                call.reject("Camera permission not granted");
+                return;
+            }
 
-        call.setKeepAlive(true);
+            if (cameraProvider == null) {
+                call.reject("Camera not initialized");
+                return;
+            }
 
-        scanCall = call;
-        isScanning = true;
+            if (isScanning) {
+                call.reject("Already scanning");
+                return;
+            }
 
-        imageAnalysis =
-            new ImageAnalysis.Builder()
-                .setBackpressureStrategy(
-                    ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST
-                )
-                .build();
+            barcodeScanner = BarcodeScanning.getClient();
 
-        imageAnalysis.setAnalyzer(
-            barcodeExecutor,
-            this::processBarcode
-        );
+            call.setKeepAlive(true);
+            scanCall = call;
+            isScanning = true;
 
-        cameraProvider.unbindAll();
+            imageAnalysis =
+                new ImageAnalysis.Builder()
+                    .setBackpressureStrategy(
+                        ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST
+                    )
+                    .build();
 
-        Preview preview = new Preview.Builder().build();
-        preview.setSurfaceProvider(previewView.getSurfaceProvider());
+            imageAnalysis.setAnalyzer(
+                barcodeExecutor,
+                this::processBarcode
+            );
 
-        imageCapture =
-            new ImageCapture.Builder()
-                .setCaptureMode(ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY)
-                .build();
+            cameraProvider.unbindAll();
 
-        if (cameraSelector == null) {
-            cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA;
-        }
+            Preview preview = new Preview.Builder().build();
+            preview.setSurfaceProvider(previewView.getSurfaceProvider());
 
-        camera = cameraProvider.bindToLifecycle(
-            getActivity(),
-            cameraSelector,
-            preview,
-            imageCapture,
-            imageAnalysis
-        );
+            imageCapture =
+                new ImageCapture.Builder()
+                    .setCaptureMode(ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY)
+                    .build();
 
-        call.resolve();
+            camera = cameraProvider.bindToLifecycle(
+                getActivity(),
+                cameraSelector,
+                preview,
+                imageCapture,
+                imageAnalysis
+            );
 
+            call.resolve();
+        });
     }
 
+
     private void processBarcode(ImageProxy imageProxy) {
 
         if (!isScanning) {
@@ -842,6 +844,46 @@ public class CameraModulePlugin extends Plugin {
         );
     }
 
+    private Bitmap rotateBitmapIfRequired(Bitmap bitmap, File photoFile) throws Exception {
+
+        ExifInterface exif = new ExifInterface(photoFile.getAbsolutePath());
+
+        int orientation = exif.getAttributeInt(
+            ExifInterface.TAG_ORIENTATION,
+            ExifInterface.ORIENTATION_NORMAL
+        );
+
+        Matrix matrix = new Matrix();
+
+        switch (orientation) {
+            case ExifInterface.ORIENTATION_ROTATE_90:
+                matrix.postRotate(90);
+                break;
+            case ExifInterface.ORIENTATION_ROTATE_180:
+                matrix.postRotate(180);
+                break;
+            case ExifInterface.ORIENTATION_ROTATE_270:
+                matrix.postRotate(270);
+                break;
+            default:
+                return bitmap;
+        }
+
+        Bitmap rotated = Bitmap.createBitmap(
+            bitmap,
+            0,
+            0,
+            bitmap.getWidth(),
+            bitmap.getHeight(),
+            matrix,
+            true
+        );
+
+        bitmap.recycle();
+        return rotated;
+    }
+
+
 
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-camera-module",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "description": "Plugin to request permissiones view camera take phots",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",