react-native-rectangle-doc-scanner 3.147.0 → 3.149.0

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

@@ -99,9 +99,10 @@ class CameraView(context: Context) : FrameLayout(context), LifecycleOwner {
      * Bind camera use cases
      */
     private fun bindCamera() {
-        val lifecycleOwner = when (context) {
-            is LifecycleOwner -> context as LifecycleOwner
-            is ThemedReactContext -> context.currentActivity as? LifecycleOwner ?: context as? LifecycleOwner
+        val ctx = context
+        val lifecycleOwner = when {
+            ctx is LifecycleOwner -> ctx
+            ctx is ThemedReactContext -> ctx.currentActivity as? LifecycleOwner ?: ctx as? LifecycleOwner
             else -> null
         }
         if (lifecycleOwner == null) {
@@ -207,13 +208,14 @@ class CameraView(context: Context) : FrameLayout(context), LifecycleOwner {
                     onRectangleDetected?.invoke(transformedRectangle)
                 }
             } catch (e: Exception) {
-            Log.e(TAG, "Failed to analyze frame", e)
-            post {
-                overlayView.setDetectedRectangle(null)
-                onRectangleDetected?.invoke(null)
+                Log.e(TAG, "Failed to analyze frame", e)
+                post {
+                    overlayView.setDetectedRectangle(null)
+                    onRectangleDetected?.invoke(null)
+                }
+            } finally {
+                imageProxy.close()
             }
-        } finally {
-            imageProxy.close()
         }
     }
 
@@ -225,7 +227,6 @@ class CameraView(context: Context) : FrameLayout(context), LifecycleOwner {
             cameraExecutor.shutdown()
         }
     }
-    }
 
     /**
      * Overlay view for grid and rectangle

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.147.0",
+  "version": "3.149.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 });