scoplan.camera 1.2.5 → 1.2.9

package/.github/instructions/snyk_rules.instructions.md

@@ -0,0 +1,14 @@
+---
+alwaysApply: true
+always_on: true
+trigger: always_on
+applyTo: "**"
+description: Snyk Security At Inception
+---
+
+# Project security best practices
+
+- Always run snyk_code_scan tool for new first party code that is generated in a Snyk-supported language.
+- If any security issues are found based on newly introduced or modified code or dependencies, attempt to fix the issues using the results context from Snyk.
+- Rescan the code after fixing the issues to ensure that the issues were fixed and that there are no newly introduced issues.
+- Repeat this process until no new issues are found.

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "snyk.advanced.autoSelectOrganization": true
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scoplan.camera",
-  "version": "1.2.5",
+  "version": "1.2.9",
   "description": "",
   "cordova": {
     "id": "scoplan.camera",

package/plugin.xml

@@ -65,7 +65,7 @@
 		<framework custom="true" src="src/android/gradle/scoplanCamera.gradle" type="gradleReference" />
 		<framework src="com.google.android.material:material:1.5.0-alpha02" />
 		<framework src="com.squareup.picasso:picasso:2.8" />
-		<framework src="io.sentry:sentry-android:7.2.0" />
+		<framework src="io.sentry:sentry-android:8.31.0" />
 		<framework src="androidx.constraintlayout:constraintlayout:2.1.4" />
 		<lib-file src="src/android/libs/ds-photo-editor-sdk-v9.aar" />
 	</platform>

package/src/android/CCropActivity.java

@@ -2,6 +2,12 @@ package scoplan.camera;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.view.View;
+
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import com.dsphotoeditor.sdk.activity.DsPhotoEditorCropActivity;
 
@@ -13,5 +19,16 @@ public  class CCropActivity extends DsPhotoEditorCropActivity {
         int themeId = context.getResources().getIdentifier("AppTheme.NoActionBar", "style", context.getPackageName());
         setTheme(themeId);
         super.onCreate(savedInstanceState);
+
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+
+        View rootView = findViewById(com.dsphotoeditor.sdk.R.id.ds_photo_editor_crop_root_layout);
+        if (rootView != null) {
+            ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, windowInsets) -> {
+                Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+                v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+                return WindowInsetsCompat.CONSUMED;
+            });
+        }
     }
 }

package/src/android/CDrawActivity.java

@@ -2,6 +2,13 @@ package scoplan.camera;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.view.View;
+
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 import com.dsphotoeditor.sdk.activity.DsPhotoEditorDrawActivity;
 
 public class CDrawActivity extends DsPhotoEditorDrawActivity {
@@ -12,5 +19,16 @@ public class CDrawActivity extends DsPhotoEditorDrawActivity {
         int themeId = context.getResources().getIdentifier("AppTheme.NoActionBar", "style", context.getPackageName());
         setTheme(themeId);
         super.onCreate(savedInstanceState);
+
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+
+        View rootView = findViewById(com.dsphotoeditor.sdk.R.id.ds_photo_editor_draw_root_layout);
+        if (rootView != null) {
+            ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, windowInsets) -> {
+                Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+                v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+                return WindowInsetsCompat.CONSUMED;
+            });
+        }
     }
 }

package/src/android/CTextActivity.java

@@ -2,6 +2,13 @@ package scoplan.camera;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.view.View;
+
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 import com.dsphotoeditor.sdk.activity.DsPhotoEditorTextActivity;
 
 public class CTextActivity extends DsPhotoEditorTextActivity {
@@ -12,6 +19,17 @@ public class CTextActivity extends DsPhotoEditorTextActivity {
         int themeId = context.getResources().getIdentifier("AppTheme.NoActionBar", "style", context.getPackageName());
         setTheme(themeId);
         super.onCreate(savedInstanceState);
+
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+
+        View rootView = findViewById(com.dsphotoeditor.sdk.R.id.ds_photo_editor_text_sticker_root_layout);
+        if (rootView != null) {
+            ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, windowInsets) -> {
+                Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+                v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+                return WindowInsetsCompat.CONSUMED;
+            });
+        }
     }
 }
 

package/src/android/CameraFragment.java

@@ -31,6 +31,7 @@ import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
@@ -41,6 +42,7 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.util.Log;
 import android.util.Size;
+import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.OrientationEventListener;
 import android.view.Surface;
@@ -66,6 +68,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import capacitor.cordova.android.plugins.R;
 import io.sentry.Sentry;
 
 public class CameraFragment extends Fragment implements scoplan.camera.OnImageCaptureListener, View.OnClickListener {
@@ -87,7 +90,7 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
     private OrientationEventListener orientationEventListener;
     private CameraCaptureSession cameraCaptureSessions;
     private CaptureRequest.Builder captureRequestBuilder;
-    private String cameraId;
+    private String cameraId = null;
     private int CAMERA_REQUEST_PERMISSION = 5000;
     private Handler mBackgroundHandler;
     private HandlerThread mBackgroundThread;
@@ -101,17 +104,41 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
     private int currentOrientation = -1;
     private boolean flashOn = false;
     private boolean cameraIsOpen = false;
-
+    private boolean previewReady = false;
     private SurfaceHolder mSurfaceHolder;
 
     private boolean surfaceAvailable = false;
+    private boolean surfaceSizeConfigured = false;
+    private Size optimalPreviewSize = null;
     private LinearLayout cameraFrameLayout;
+    private boolean callbackAdded = false;
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if (!callbackAdded) {
+            mSurfaceHolder.addCallback(surfaceHolderCallBack);
+            callbackAdded = true;
+        }
+
+        // Apply window insets to root view to handle system bars
+        androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(view, (v, windowInsets) -> {
+            androidx.core.graphics.Insets insets = windowInsets.getInsets(androidx.core.view.WindowInsetsCompat.Type.systemBars());
+
+            // Apply padding to root view
+            v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+
+            return androidx.core.view.WindowInsetsCompat.CONSUMED;
+        });
+    }
 
     private final SurfaceHolder.Callback surfaceHolderCallBack = new SurfaceHolder.Callback() {
         @Override
         public void surfaceCreated(@NonNull SurfaceHolder surfaceHolder) {
             surfaceAvailable = true;
-            openCamera();
+            if(!cameraIsOpen) {
+                openCamera();
+            }
         }
 
         @Override
@@ -121,8 +148,8 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
 
         @Override
         public void surfaceDestroyed(@NonNull SurfaceHolder surfaceHolder) {
-            //TODO close
             surfaceAvailable = false;
+            surfaceSizeConfigured = false;
             release();
         }
     };
@@ -132,19 +159,24 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
         public void onOpened(@NonNull CameraDevice camera) {
             cameraDevice = camera;
             cameraIsOpen = true;
-            createCameraPreview();
+            // Configure surface size first; surfaceChanged will trigger createCameraPreview
+            configureSurfaceSize();
         }
 
         @Override
-        public void onDisconnected(@NonNull CameraDevice cameraDevice) {
-            cameraDevice.close();
+        public void onDisconnected(@NonNull CameraDevice camera) {
             cameraIsOpen = false;
+            previewReady = false;
+            surfaceSizeConfigured = false;
             release();
         }
 
         @Override
-        public void onError(@NonNull CameraDevice cameraDevice, int i) {
-            cameraDevice.close();
+        public void onError(@NonNull CameraDevice camera, int error) {
+            Log.e(SCOPLAN_TAG, "CameraDevice.StateCallback onError: " + error);
+            cameraIsOpen = false;
+            previewReady = false;
+            surfaceSizeConfigured = false;
             release();
         }
     };
@@ -198,13 +230,29 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
             }
         };
 
-        this.fakeR = new FakeR(getContext());
+        this.fakeR = new FakeR(requireActivity());
+    }
+
+    private int findStyleResId(Context context, String styleName) {
+        // Convert dotted names (AppTheme.NoActionBar) to compiled names (AppTheme_NoActionBar)
+        String compiledName = styleName.replace('.', '_');
+
+        int resId = context.getResources().getIdentifier(
+            compiledName,
+            "style",
+            context.getPackageName()
+        );
+
+        return resId;
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(LayoutInflater outerInflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
+        int themeId = getActivity().getResources().getIdentifier("AppTheme.fullscreen", "style", getActivity().getPackageName());
+        ContextThemeWrapper themeContext = new ContextThemeWrapper(requireActivity(), themeId);
+        LayoutInflater inflater = outerInflater.cloneInContext(themeContext);
         View view =  inflater.inflate(this.fakeR.getLayout("fragment_camera"), container, false);
         camButton = view.findViewById(this.fakeR.getId("button_capture"));
         zoomBar = view.findViewById(this.fakeR.getId("camera_zoom"));
@@ -217,7 +265,6 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
         drawOn = view.findViewById(this.fakeR.getId("draw_on"));
         assert surfaceView != null;
         mSurfaceHolder = surfaceView.getHolder();
-        mSurfaceHolder.addCallback(surfaceHolderCallBack);
         souche = view.findViewById(this.fakeR.getId("image_souche"));
         cameraTopBar = view.findViewById(this.fakeR.getId("cameraTopBar"));
         cancelBtn = view.findViewById(this.fakeR.getId("cancel"));
@@ -233,51 +280,107 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
         validationButton.setOnClickListener(this);
         flashBtn.setOnClickListener(this);
         this.defineViewVisibility();
+
         return view;
     }
 
+    private void configureSurfaceSize() {
+        if (cameraId == null || getActivity() == null) {
+            // Can't configure yet, fall back to direct preview
+            surfaceSizeConfigured = true;
+            createCameraPreview();
+            return;
+        }
+        try {
+            CameraCharacteristics characteristics = manager.getCameraCharacteristics(cameraId);
+            StreamConfigurationMap map = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+            if (map != null) {
+                Size[] outputSizes = map.getOutputSizes(SurfaceTexture.class);
+                optimalPreviewSize = selectedPreviewSize(outputSizes);
+                if (optimalPreviewSize != null && cameraFrameLayout.getWidth() > 0) {
+                    Size displaySize = calculateSurfaceSize(optimalPreviewSize);
+                    getActivity().runOnUiThread(() -> {
+                        if (!isAdded()) return;
+                        ViewGroup.LayoutParams layoutParams = surfaceView.getLayoutParams();
+                        layoutParams.width = displaySize.getWidth();
+                        layoutParams.height = displaySize.getHeight();
+                        surfaceView.setLayoutParams(layoutParams);
+                        // Set buffer to camera native resolution
+                        mSurfaceHolder.setFixedSize(optimalPreviewSize.getWidth(), optimalPreviewSize.getHeight());
+                        // surfaceChanged will be called → createCameraPreview
+                        surfaceSizeConfigured = true;
+                    });
+                    return;
+                }
+            }
+        } catch (Exception e) {
+            Log.e(SCOPLAN_TAG, "Error configuring surface size", e);
+        }
+        // Fallback: proceed directly
+        surfaceSizeConfigured = true;
+        createCameraPreview();
+    }
+
     private void createCameraPreview() {
-        if(cameraDevice == null || !surfaceAvailable)
+        if(cameraDevice == null || !surfaceAvailable || previewReady || !surfaceSizeConfigured)
             return;
         if(!cameraIsOpen) {
             this.openCamera();
+            return;
         }
+        previewReady = true;
         try{
+            // Close any existing session before creating a new one
+            closeSession();
+
             Surface surface = mSurfaceHolder.getSurface();
             captureRequestBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
             captureRequestBuilder.addTarget(surface);
             cameraDevice.createCaptureSession(Arrays.asList(surface), new CameraCaptureSession.StateCallback() {
                 @Override
                 public void onConfigured(@NonNull CameraCaptureSession cameraCaptureSession) {
-                    if(cameraDevice == null)
+                    if(cameraDevice == null) {
+                        previewReady = false;
                         return;
+                    }
                     cameraCaptureSessions = cameraCaptureSession;
                     updatePreview();
                 }
 
                 @Override
                 public void onConfigureFailed(@NonNull CameraCaptureSession cameraCaptureSession) {
-                    Sentry.captureMessage(cameraCaptureSession.toString());
+                    Log.e(SCOPLAN_TAG, "onConfigureFailed for preview session");
+                    Sentry.captureMessage("onConfigureFailed: " + cameraCaptureSession.toString());
+                    previewReady = false;
+                    failedCapture();
                 }
-            },null);
+            }, mBackgroundHandler);
         } catch (Exception e) {
+            Log.e(SCOPLAN_TAG, "Error creating camera preview", e);
             Sentry.captureException(e);
+            previewReady = false;
             this.failedCapture();
         }
     }
 
     private void openCamera() {
         try{
+            if (cameraId != null ) {
+                return;
+            }
             for (String id : manager.getCameraIdList()) {
                 CameraCharacteristics cameraCharacteristics =
                     manager.getCameraCharacteristics(id);
-                if (cameraCharacteristics.get(cameraCharacteristics.LENS_FACING) ==
+                if (cameraCharacteristics.get(CameraCharacteristics.LENS_FACING) ==
                     CameraCharacteristics.LENS_FACING_BACK) {
                     cameraId = id;
                     break;
                 }
             }
-            cameraId = manager.getCameraIdList()[0];
+            // Fallback to first camera only if no back camera was found
+            if (cameraId == null) {
+                cameraId = manager.getCameraIdList()[0];
+            }
             CameraCharacteristics characteristics = manager.getCameraCharacteristics(cameraId);
             StreamConfigurationMap map = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
             assert map != null;
@@ -310,28 +413,9 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
     }
 
     private void updatePreview() {
-        if(cameraDevice == null)
-            Log.e(SCOPLAN_TAG, "Error camera");
-        captureRequestBuilder.set(CaptureRequest.CONTROL_MODE,CaptureRequest.CONTROL_MODE_AUTO);
-        try{
-            CameraCharacteristics cameraCharacteristics =
-                manager.getCameraCharacteristics(cameraId);
-            StreamConfigurationMap map = cameraCharacteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
-            if(map != null) {
-                Size[] outputSizes = map.getOutputSizes(SurfaceTexture.class);
-                Size preferredSize = selectedPreviewSize(outputSizes);
-                if(preferredSize != null) {
-                    ViewGroup.LayoutParams layoutParams = surfaceView.getLayoutParams();
-                    Size surfaceSize = calculateSurfaceSize(preferredSize);
-                    getActivity().runOnUiThread(() -> {
-                        layoutParams.width = surfaceSize.getWidth();
-                        layoutParams.height = surfaceSize.getHeight();
-                        mSurfaceHolder.setFixedSize(surfaceSize.getWidth(), surfaceSize.getHeight());
-                        surfaceView.setLayoutParams(layoutParams);
-                    });
-                }
-            }
-            cameraCaptureSessions.setRepeatingRequest(captureRequestBuilder.build(),null, mBackgroundHandler);
+        captureRequestBuilder.set(CaptureRequest.CONTROL_MODE, CaptureRequest.CONTROL_MODE_AUTO);
+        try {
+            cameraCaptureSessions.setRepeatingRequest(captureRequestBuilder.build(), null, mBackgroundHandler);
             this.cameraSeekBarListener = new scoplan.camera.CameraSeekBarListener(cameraId, manager, zoomBar, captureRequestBuilder, cameraCaptureSessions, mBackgroundHandler);
         } catch (Exception e) {
             Sentry.captureException(e);
@@ -341,23 +425,54 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
 
     private Size calculateSurfaceSize(Size selectedSize) {
         int parentWidth = this.cameraFrameLayout.getWidth();
-        Size correctSize = new Size(selectedSize.getHeight(), selectedSize.getWidth()); // We are in portrait mode
+        int parentHeight = this.cameraFrameLayout.getHeight();
+
+        // Camera sensor is landscape, but we display in portrait → swap W/H
+        float previewAspectRatio = (float) selectedSize.getHeight() / selectedSize.getWidth();
 
-        float aspectRatio = (float) correctSize.getWidth() / correctSize.getHeight();
+        // Center-crop: fill the entire parent, crop overflow (no distortion)
+        int surfaceWidth, surfaceHeight;
+        int fitWidth = parentWidth;
+        int fitHeight = (int) (parentWidth / previewAspectRatio);
+
+        if (fitHeight >= parentHeight) {
+            // Fit by width already fills the height — use it
+            surfaceWidth = fitWidth;
+            surfaceHeight = fitHeight;
+        } else {
+            // Fit by height and let width overflow
+            surfaceHeight = parentHeight;
+            surfaceWidth = (int) (parentHeight * previewAspectRatio);
+        }
 
-        int height = (int) (parentWidth / aspectRatio);
-        return new Size(parentWidth, height);
+        return new Size(surfaceWidth, surfaceHeight);
     }
 
     private Size selectedPreviewSize(Size[] outputSizes) {
-        float targetAspectRatio = 1f; // For example, 16:9 aspect ratio
-        // Choose a suitable size from outputSizes based on the aspect ratio
+        // Target 4:3 aspect ratio (landscape sensor: width > height, so 4/3 ≈ 1.333)
+        float targetAspectRatio = 4f / 3f;
         Size selectedSize = null;
+        int bestArea = 0;
+
         for (Size size : outputSizes) {
             float aspectRatio = (float) size.getWidth() / size.getHeight();
-            if (Math.abs(aspectRatio - targetAspectRatio) < 0.1) {
-                selectedSize = size;
-                break;
+            if (Math.abs(aspectRatio - targetAspectRatio) < 0.05) {
+                // Among matching ratios, pick the largest for best quality
+                int area = size.getWidth() * size.getHeight();
+                if (area > bestArea) {
+                    bestArea = area;
+                    selectedSize = size;
+                }
+            }
+        }
+
+        // Fallback: if no 4:3, pick the largest size available
+        if (selectedSize == null && outputSizes.length > 0) {
+            selectedSize = outputSizes[0];
+            for (Size size : outputSizes) {
+                if (size.getWidth() * size.getHeight() > selectedSize.getWidth() * selectedSize.getHeight()) {
+                    selectedSize = size;
+                }
             }
         }
         return selectedSize;
@@ -367,23 +482,22 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
     public void onResume() {
         super.onResume();
         startBackgroundThread();
-        if(surfaceAvailable)
+        if(surfaceAvailable && !cameraIsOpen) {
             openCamera();
-        else {
-            mSurfaceHolder.addCallback(surfaceHolderCallBack);
         }
         this.orientationEventListener.enable();
 
         Window window = requireActivity().getWindow();
 
+        // Enable edge-to-edge mode but keep system bars visible
+        WindowCompat.setDecorFitsSystemWindows(window, false);
+
         WindowInsetsControllerCompat controller =
             WindowCompat.getInsetsController(window, window.getDecorView());
 
         if (controller != null) {
-            controller.hide(WindowInsets.Type.statusBars());
-            controller.setSystemBarsBehavior(
-                WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-            );
+            // Show status and navigation bars
+            controller.show(WindowInsets.Type.systemBars());
         }
     }
 
@@ -393,11 +507,15 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
         super.onPause();
         this.orientationEventListener.disable();
         Window window = requireActivity().getWindow();
+
+        // Restore normal window mode when leaving camera
+        WindowCompat.setDecorFitsSystemWindows(window, true);
+
         WindowInsetsControllerCompat controller =
             WindowCompat.getInsetsController(window, window.getDecorView());
 
         if (controller != null) {
-            controller.show(WindowInsets.Type.statusBars());
+            controller.show(WindowInsets.Type.systemBars());
         }
         release();
     }
@@ -408,23 +526,44 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
         release();
     }
 
+    private void closeSession() {
+        if(cameraCaptureSessions != null) {
+            try {
+                cameraCaptureSessions.close();
+            } catch (Exception e) {
+                Log.e(SCOPLAN_TAG, "Error closing capture session", e);
+            }
+            cameraCaptureSessions = null;
+        }
+    }
+
     private void release() {
+        closeSession();
         if(cameraDevice != null) {
-            cameraDevice.close();
+            try {
+                cameraDevice.close();
+            } catch (Exception e) {
+                Log.e(SCOPLAN_TAG, "Error closing camera device", e);
+            }
             cameraIsOpen = false;
+            previewReady = false;
             cameraDevice = null;
+            cameraId = null;
         }
     }
 
     private void stopBackgroundThread() {
+        if (mBackgroundThread == null) {
+            return;
+        }
         mBackgroundThread.quitSafely();
         try{
             mBackgroundThread.join();
-            mBackgroundThread= null;
-            mBackgroundHandler = null;
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            Log.e(SCOPLAN_TAG, "Error stopping background thread", e);
         }
+        mBackgroundThread = null;
+        mBackgroundHandler = null;
     }
 
     private void startBackgroundThread() {
@@ -442,15 +581,18 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
     }
 
     private void takePicture() {
+        if(getContext() == null) {
+            return;
+        }
         if(this.pictureCount >= this.photoLimit){
             Toast toast = Toast.makeText(this.getContext(), "La prise de photos est limitée à " + this.photoLimit + " par envoi", Toast.LENGTH_SHORT);
             toast.show();
             return;
         }
-        if(this.mBackgroundThread == null || !this.mBackgroundThread.isInterrupted() || !this.mBackgroundThread.isAlive()) {
+        if(this.mBackgroundThread == null || !this.mBackgroundThread.isAlive()) {
             this.startBackgroundThread();
         }
-        if(cameraDevice == null) {
+        if(cameraDevice == null || cameraId == null) {
             return;
         }
         this.pictureCount++;
@@ -459,9 +601,12 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
         try {
             CameraCharacteristics characteristics = manager.getCameraCharacteristics(cameraId);
             Size[] jpegSizes = null;
-            if(characteristics != null)
-                jpegSizes = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)
-                    .getOutputSizes(ImageFormat.JPEG);
+            if(characteristics != null) {
+                StreamConfigurationMap map = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+                if (map != null) {
+                    jpegSizes = map.getOutputSizes(ImageFormat.JPEG);
+                }
+            }
             //Capture image with custom size
             int width = 640;
             int height = 480;
@@ -470,7 +615,7 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
                 width = jpegSizes[0].getWidth();
                 height = jpegSizes[0].getHeight();
             }
-            final ImageReader reader = ImageReader.newInstance(width, height, ImageFormat.JPEG,1);
+            final ImageReader reader = ImageReader.newInstance(width, height, ImageFormat.JPEG, 1);
             List<Surface> outputSurface = new ArrayList<>(2);
             outputSurface.add(reader.getSurface());
             outputSurface.add(mSurfaceHolder.getSurface());
@@ -480,7 +625,7 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
             captureBuilder.set(CaptureRequest.FLASH_MODE, flashOn ? CaptureRequest.FLASH_MODE_TORCH : CaptureRequest.FLASH_MODE_OFF);
             String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
             String fileName = "IMG_"+ timeStamp + ".jpg";
-            File file = new File( this.getContext().getExternalFilesDir(Environment.DIRECTORY_PICTURES), fileName);
+            File file = new File(this.getContext().getExternalFilesDir(Environment.DIRECTORY_PICTURES), fileName);
             ImageReader.OnImageAvailableListener readerListener = new scoplan.camera.ImageCameraAvailableListener(file, reader, this, currentOrientation);
 
             reader.setOnImageAvailableListener(readerListener, mBackgroundHandler);
@@ -488,14 +633,18 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
                 @Override
                 public void onCaptureCompleted(@NonNull CameraCaptureSession session, @NonNull CaptureRequest request, @NonNull TotalCaptureResult result) {
                     super.onCaptureCompleted(session, request, result);
+                    reader.close();
+                    previewReady = false;
                     createCameraPreview();
                 }
 
                 @Override
                 public void onCaptureFailed(@NonNull CameraCaptureSession session, @NonNull CaptureRequest request, @NonNull CaptureFailure failure) {
                     super.onCaptureFailed(session, request, failure);
+                    reader.close();
                     Sentry.captureMessage("Failed capture _" + failure.getReason());
                     Log.e(SCOPLAN_TAG, "Error FAILED Capture " + failure.getReason());
+                    pictureCount--;
                     failedCapture();
                 }
             };
@@ -508,43 +657,59 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
                     } catch (Exception e) {
                         Log.e(SCOPLAN_TAG, "Error - " + e.getMessage());
                         Sentry.captureException(e);
+                        reader.close();
+                        pictureCount--;
                         failedCapture();
                     }
                 }
 
                 @Override
                 public void onConfigureFailed(@NonNull CameraCaptureSession cameraCaptureSession) {
-                    Log.e(SCOPLAN_TAG, "Error FAILED Configuration ");
-                    Sentry.captureMessage("Failed configure cameraCaptureSession");
+                    Log.e(SCOPLAN_TAG, "Error FAILED Configuration for capture session");
+                    Sentry.captureMessage("Failed configure capture session");
+                    reader.close();
+                    pictureCount--;
                     failedCapture();
                 }
             }, mBackgroundHandler);
 
         } catch (Exception e) {
+            Log.e(SCOPLAN_TAG, "Error in takePicture", e);
             Sentry.captureException(e);
-            throw new RuntimeException(e);
+            pictureCount--;
+            failedCapture();
         }
     }
 
     @Override
     public void onImageCapture(File file, Bitmap bitmap) {
         pictures.add(file.getAbsolutePath());
-        getActivity().runOnUiThread(() -> {
-            souche.setImageBitmap(bitmap);
-            defineViewVisibility();
-        });
+        if (getActivity() != null && isAdded()) {
+            getActivity().runOnUiThread(() -> {
+                if (isAdded()) {
+                    souche.setImageBitmap(bitmap);
+                    defineViewVisibility();
+                }
+            });
+        }
     }
 
     @Override
     public void onImageBuildFailed(Exception e) {
         Sentry.captureException(e);
+        pictureCount--;
         failedCapture();
     }
 
     public void failedCapture() {
-        Toast toast = Toast.makeText(getContext(), "Oups! une erreur pendant la capture. Veuillez rééssayer.", Toast.LENGTH_LONG);
-        toast.show();
+        if (getActivity() == null || !isAdded()) {
+            return;
+        }
         getActivity().runOnUiThread(() -> {
+            if (!isAdded() || getContext() == null) {
+                return;
+            }
+            Toast.makeText(getContext(), "Oups! une erreur pendant la capture. Veuillez rééssayer.", Toast.LENGTH_LONG).show();
             defineViewVisibility();
         });
     }

package/src/android/ImageCameraAvailableListener.java

@@ -29,33 +29,43 @@ public class ImageCameraAvailableListener implements ImageReader.OnImageAvailabl
         Image image = null;
         try{
             image = reader.acquireLatestImage();
+            if (image == null) {
+                this.imageCaptureListener.onImageBuildFailed(new IOException("Failed to acquire image"));
+                return;
+            }
             ByteBuffer buffer = image.getPlanes()[0].getBuffer();
             byte[] bytes = new byte[buffer.capacity()];
             buffer.get(bytes);
             this.imageCaptureListener.onImageCapture(file, save(bytes));
         }
-        catch (IOException e)
+        catch (Exception e)
         {
             e.printStackTrace();
             this.imageCaptureListener.onImageBuildFailed(e);
         }
         finally {
-            {
-                if(image != null)
-                    image.close();
-            }
+            if(image != null)
+                image.close();
         }
     }
 
     private Bitmap save(byte[] bytes) throws IOException {
         OutputStream outputStream = null;
+        Bitmap bmp = null;
         try{
             outputStream = new FileOutputStream(file);
-            Bitmap bmp = BitmapFactory.decodeByteArray(bytes,0, bytes.length);
+            bmp = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
+            if (bmp == null) {
+                throw new IOException("Failed to decode image bytes");
+            }
             Matrix matrix = new Matrix();
             matrix.setRotate(this.rotation);
             Bitmap rotatedBitmap = Bitmap.createBitmap(bmp, 0, 0, bmp.getWidth(), bmp.getHeight(), matrix, true);
             rotatedBitmap.compress(Bitmap.CompressFormat.JPEG, 65, outputStream);
+            // Recycle original bitmap only if rotation created a new one
+            if (rotatedBitmap != bmp) {
+                bmp.recycle();
+            }
             return rotatedBitmap;
         } finally {
             if(outputStream != null)

package/src/android/PhotoEditorActivity.java

@@ -13,6 +13,11 @@ import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 import com.dsphotoeditor.sdk.activity.DsPhotoEditorActivity;
 
 import java.io.File;
@@ -28,6 +33,10 @@ public class PhotoEditorActivity extends DsPhotoEditorActivity {
         int themeId = context.getResources().getIdentifier("AppTheme.NoActionBar", "style", context.getPackageName());
         setTheme(themeId);
         super.onCreate(savedInstanceState);
+
+        // Enable edge-to-edge and handle system bars
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+
         this.fakeR = new FakeR(this);
         this.e = this.getIntent().getData();
         if (this.e == null) {
@@ -36,6 +45,16 @@ public class PhotoEditorActivity extends DsPhotoEditorActivity {
         } else {
             this.createBottomBar(savedInstanceState);
         }
+
+        // Apply window insets to root layout
+        View rootView = findViewById(fakeR.getId("ds_photo_editor_root_layout"));
+        if (rootView != null) {
+            ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, windowInsets) -> {
+                Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+                v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+                return WindowInsetsCompat.CONSUMED;
+            });
+        }
     }
 
     @SuppressLint("ResourceType")

package/src/android/PhotoEditorMesureCustomActivity.java

@@ -1,6 +1,10 @@
 package scoplan.camera;
 
 import androidx.core.content.ContextCompat;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -53,6 +57,18 @@ public class PhotoEditorMesureCustomActivity extends DsPhotoEditorTextActivity i
         super.onCreate(var1);
         this.fakeR = new FakeR(this);
         this.setContentView(com.dsphotoeditor.sdk.R.layout.activity_ds_photo_editor_sticker_text);
+
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+
+        View rootView = findViewById(com.dsphotoeditor.sdk.R.id.ds_photo_editor_text_sticker_root_layout);
+        if (rootView != null) {
+            ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, windowInsets) -> {
+                Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+                v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+                return WindowInsetsCompat.CONSUMED;
+            });
+        }
+
         if (original != null && !original.isRecycled()) {
             this.a();
             this.b();

package/src/android/ScoplanCamera.java

@@ -1,5 +1,6 @@
 package scoplan.camera;
 
+import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.widget.FrameLayout;
 
@@ -38,20 +39,21 @@ public class ScoplanCamera extends CordovaPlugin implements CameraEventListener
 
     private void takePictures(int limit, int currentCount) {
         cordova.getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        CameraEventListener cameraEventListener = this;
+        scoplan.camera.CameraEventListener cameraEventListener = this;
         cordova.getActivity().runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 containerView = (FrameLayout)cordova.getActivity().findViewById(containerViewId);
                 if(containerView == null){
-                    containerView = new FrameLayout(cordova.getActivity().getApplicationContext());
+                    Context context = cordova.getActivity();
+                    containerView = new FrameLayout(context);
                     containerView.setId(containerViewId);
                     FrameLayout.LayoutParams containerLayoutParams = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT);
                     cordova.getActivity().addContentView(containerView, containerLayoutParams);
                     //add the fragment to the container
                 }
                 containerView.setClickable(true);
-                cameraFragment = new CameraFragment();
+                cameraFragment = new scoplan.camera.CameraFragment();
                 if(currentCount > 0){
                     cameraFragment.setCurrentCount(currentCount);
                 }

package/src/android/res/layout/fragment_camera.xml

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/shape_rectangle">
+    android:background="#000000">
     <LinearLayout
         android:id="@+id/camera_frame_layout"
         android:layout_width="match_parent"