react-native-rectangle-doc-scanner 3.148.0 → 3.150.0

package/android/src/main/kotlin/com/reactnativerectangledocscanner/CameraController.kt

@@ -8,6 +8,7 @@ import androidx.camera.core.*
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.camera.view.PreviewView
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import java.io.File
 import java.util.concurrent.ExecutorService
@@ -68,6 +69,13 @@ class CameraController(
     private fun bindCameraUseCases(enableDetection: Boolean) {
         val cameraProvider = cameraProvider ?: return
 
+        // Check lifecycle state
+        val lifecycle = lifecycleOwner.lifecycle
+        if (lifecycle.currentState == Lifecycle.State.DESTROYED) {
+            Log.e(TAG, "Cannot bind camera - lifecycle is destroyed")
+            return
+        }
+
         // Select camera
         val cameraSelector = if (useFrontCamera) {
             CameraSelector.DEFAULT_FRONT_CAMERA
@@ -79,14 +87,12 @@ class CameraController(
         val preview = Preview.Builder()
             .setTargetResolution(Size(1080, 1920))
             .build()
-            .also {
-                it.setSurfaceProvider(previewView.surfaceProvider)
-            }
 
         // Image capture use case (high resolution for document scanning)
         imageCapture = ImageCapture.Builder()
             .setCaptureMode(ImageCapture.CAPTURE_MODE_MAXIMIZE_QUALITY)
             .setTargetResolution(Size(1920, 2560))
+            .setFlashMode(ImageCapture.FLASH_MODE_AUTO)
             .build()
 
         // Image analysis use case for rectangle detection
@@ -121,12 +127,15 @@ class CameraController(
                 *useCases.toTypedArray()
             )
 
+            // Set surface provider AFTER binding to lifecycle
+            preview.setSurfaceProvider(previewView.surfaceProvider)
+
             // Restore torch state if it was enabled
             if (torchEnabled) {
                 setTorchEnabled(true)
             }
 
-            Log.d(TAG, "Camera started successfully")
+            Log.d(TAG, "Camera started successfully, hasFlashUnit: ${camera?.cameraInfo?.hasFlashUnit()}")
         } catch (e: Exception) {
             Log.e(TAG, "Failed to bind camera use cases", e)
         }

package/android/src/main/kotlin/com/reactnativerectangledocscanner/DocumentScannerView.kt

@@ -19,6 +19,7 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.events.RCTEventEmitter
 import kotlinx.coroutines.*
+import kotlinx.coroutines.delay
 import java.io.File
 import kotlin.math.min
 
@@ -48,6 +49,7 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
     private var stableCounter = 0
     private var lastDetectionTimestamp: Long = 0L
     private var isCapturing = false
+    private var isDetaching = false
 
     // Coroutine scope for async operations
     private val scope = CoroutineScope(Dispatchers.Main + SupervisorJob())
@@ -181,6 +183,12 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
             return
         }
 
+        if (isDetaching) {
+            Log.d(TAG, "View is detaching, cannot capture")
+            promise?.reject("VIEW_DETACHING", "View is being removed")
+            return
+        }
+
         isCapturing = true
         Log.d(TAG, "Capture initiated with promise: ${promise != null}")
 
@@ -193,8 +201,14 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
         cameraController?.capturePhoto(
             outputDirectory = outputDir,
             onImageCaptured = { file ->
-                scope.launch {
-                    processAndEmitImage(file, promise)
+                if (!isDetaching) {
+                    scope.launch {
+                        processAndEmitImage(file, promise)
+                    }
+                } else {
+                    Log.d(TAG, "View detaching, skipping image processing")
+                    isCapturing = false
+                    promise?.reject("VIEW_DETACHING", "View was removed during capture")
                 }
             },
             onError = { exception ->
@@ -351,17 +365,45 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
     }
 
     fun stopCamera() {
-        cameraController?.stopCamera()
-        overlayView.setRectangle(null, overlayColor)
-        stableCounter = 0
-        if (lifecycleRegistry.currentState != Lifecycle.State.DESTROYED) {
-            lifecycleRegistry.currentState = Lifecycle.State.CREATED
+        if (!isCapturing) {
+            cameraController?.stopCamera()
+            overlayView.setRectangle(null, overlayColor)
+            stableCounter = 0
+            if (lifecycleRegistry.currentState != Lifecycle.State.DESTROYED) {
+                lifecycleRegistry.currentState = Lifecycle.State.CREATED
+            }
+        } else {
+            Log.d(TAG, "Cannot stop camera while capturing")
         }
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-        stopCamera()
+        Log.d(TAG, "onDetachedFromWindow called, isCapturing: $isCapturing")
+
+        // Mark as detaching to prevent new captures
+        isDetaching = true
+
+        // Wait for any ongoing capture to complete before cleaning up
+        if (isCapturing) {
+            Log.d(TAG, "Waiting for capture to complete before cleanup...")
+            // Use a coroutine to wait briefly for capture to complete
+            scope.launch {
+                var waitCount = 0
+                while (isCapturing && waitCount < 20) { // Wait up to 2 seconds
+                    delay(100)
+                    waitCount++
+                }
+                performCleanup()
+            }
+        } else {
+            performCleanup()
+        }
+    }
+
+    private fun performCleanup() {
+        Log.d(TAG, "Performing cleanup")
+        cameraController?.stopCamera()
         lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
         cameraController?.shutdown()
         scope.cancel()

package/android/src/main/kotlin/com/reactnativerectangledocscanner/DocumentScannerViewManager.kt

@@ -10,7 +10,7 @@ import com.facebook.react.uimanager.annotations.ReactProp
 class DocumentScannerViewManager : SimpleViewManager<DocumentScannerView>() {
 
     companion object {
-        const val REACT_CLASS = "RNPdfScannerManager"
+        const val REACT_CLASS = "RNPdfScanner"
     }
 
     override fun getName() = REACT_CLASS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-rectangle-doc-scanner",
-  "version": "3.148.0",
+  "version": "3.150.0",
   "description": "Native-backed document scanner for React Native with customizable overlays.",
   "license": "MIT",
   "main": "dist/index.js",

package/vendor/react-native-document-scanner/index.js

@@ -79,21 +79,42 @@ class PdfScanner extends React.Component {
       return;
     }
     try {
-      const granted = await PermissionsAndroid.requestMultiple([
+      const requestedPermissions = [
         PermissionsAndroid.PERMISSIONS.CAMERA,
-        PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE,
-        PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
-      ]);
+      ];
+
+      const isTiramisuOrNewer = Platform.Version >= 33;
+
+      if (isTiramisuOrNewer) {
+        // Android 13+: storage permissions split by media type. Request images access.
+        if (PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES) {
+          requestedPermissions.push(PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES);
+        }
+      } else {
+        if (PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE) {
+          requestedPermissions.push(PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE);
+        }
+        if (PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE) {
+          requestedPermissions.push(PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE);
+        }
+      }
+
+      const granted = await PermissionsAndroid.requestMultiple(requestedPermissions);
 
       const cameraGranted =
         granted['android.permission.CAMERA'] ===
         PermissionsAndroid.RESULTS.GRANTED;
-      const readGranted =
-        granted['android.permission.READ_EXTERNAL_STORAGE'] ===
-        PermissionsAndroid.RESULTS.GRANTED;
-      const writeGranted =
-        granted['android.permission.WRITE_EXTERNAL_STORAGE'] ===
-        PermissionsAndroid.RESULTS.GRANTED;
+
+      const readGranted = isTiramisuOrNewer
+        ? granted['android.permission.READ_MEDIA_IMAGES'] === PermissionsAndroid.RESULTS.GRANTED ||
+          granted['android.permission.READ_MEDIA_IMAGES'] === undefined
+        : granted['android.permission.READ_EXTERNAL_STORAGE'] === PermissionsAndroid.RESULTS.GRANTED ||
+          granted['android.permission.READ_EXTERNAL_STORAGE'] === undefined;
+
+      const writeGranted = isTiramisuOrNewer
+        ? true // WRITE_EXTERNAL_STORAGE is deprecated on API 33+
+        : granted['android.permission.WRITE_EXTERNAL_STORAGE'] === PermissionsAndroid.RESULTS.GRANTED ||
+          granted['android.permission.WRITE_EXTERNAL_STORAGE'] === undefined;
 
       if (cameraGranted && readGranted && writeGranted) {
         this.setState({ permissionsAuthorized: true });