rns-mediapicker 0.0.5 → 0.0.6

package/android/src/main/java/com/rnsmediapicker/FastMediaPickerModule.kt

@@ -50,7 +50,7 @@ class FastMediaPickerModule(
 
     // -------------------- PUBLIC API --------------------
 
-    @ReactMethod
+@ReactMethod
     fun pick(
         useCamera: Boolean,
         mediaType: String,
@@ -72,18 +72,60 @@ class FastMediaPickerModule(
         val permissions = mutableListOf<String>()
 
         if (useCamera) {
+            // Camera always needs permission
             permissions.add(Manifest.permission.CAMERA)
+        } else {
+            // GALLERY LOGIC:
+            // Android 13 (API 33) and above use the Photo Picker which REQUIRES NO PERMISSIONS.
+            // We only request storage permissions for older devices (API 32 and below).
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+                permissions.add(Manifest.permission.READ_EXTERNAL_STORAGE)
+            }
         }
 
-        if (Build.VERSION.SDK_INT >= 33) {
-            permissions.add(
-                if (mediaType == "video") {
-                    Manifest.permission.READ_MEDIA_VIDEO
-                } else {
-                    Manifest.permission.READ_MEDIA_IMAGES
-                },
+        // Filter out permissions that are already granted
+        val missing = permissions.filter {
+            activity.checkSelfPermission(it) != android.content.pm.PackageManager.PERMISSION_GRANTED
+        }
+
+        if (missing.isNotEmpty()) {
+            val pa = activity as? PermissionAwareActivity ?: run {
+                promise.reject("E_NOT_PERMISSION_AWARE", "Activity not PermissionAware")
+                cleanup()
+                return
+            }
+
+            pa.requestPermissions(
+                missing.toTypedArray(),
+                PERMISSION_REQUEST,
+                this,
             )
-        } else {
+            return
+        }
+
+        // All permissions granted (or none needed), launch the picker/camera
+        launch(activity)
+    }
+
+// Android 14 (API 34+) introduces Partial Access
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            permissions.add(Manifest.permission.READ_MEDIA_IMAGES)
+            permissions.add(Manifest.permission.READ_MEDIA_VIDEO)
+            permissions.add(Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED)
+        }
+// Android 13 (API 33)
+        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (mediaType == "video") {
+                permissions.add(Manifest.permission.READ_MEDIA_VIDEO)
+            } else if (mediaType == "image") {
+                permissions.add(Manifest.permission.READ_MEDIA_IMAGES)
+            } else {
+                permissions.add(Manifest.permission.READ_MEDIA_IMAGES)
+                permissions.add(Manifest.permission.READ_MEDIA_VIDEO)
+            }
+        }
+// Android 12 and below
+        else {
             permissions.add(Manifest.permission.READ_EXTERNAL_STORAGE)
         }
 
@@ -145,23 +187,46 @@ class FastMediaPickerModule(
         activity: Activity,
         type: String,
     ) {
+        // 1. Try the Modern Photo Picker (Android 13+ or backported to 11+)
+        // We check for the action string directly to handle backported devices
         val intent =
-            if (Build.VERSION.SDK_INT >= 33) {
-                Intent(MediaStore.ACTION_PICK_IMAGES)
-            } else {
-                Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-                    addCategory(Intent.CATEGORY_OPENABLE)
+            Intent("android.provider.action.PICK_IMAGES").apply {
+                when (type) {
+                    "video" -> this.type = "video/*"
+                    "image" -> this.type = "image/*"
+                    // For 'both', we leave the type null or specify multiple if needed
                 }
             }
 
-        intent.type =
-            when (type) {
-                "video" -> "video/*"
-                else -> "image/*"
-            }
+        try {
+            activity.startActivityForResult(intent, PICKER_REQUEST_CODE)
+        } catch (e: Exception) {
+            // 2. Fallback: Legacy ACTION_GET_CONTENT (Android 10 and below, or failed 13+)
+            val fallbackIntent =
+                Intent(Intent.ACTION_GET_CONTENT).apply {
+                    addCategory(Intent.CATEGORY_OPENABLE)
+                    this.type =
+                        when (type) {
+                            "video" -> "video/*"
+                            "image" -> "image/*"
+                            else -> "*/*" // 'both' case
+                        }
+                    // Allow both images and videos in the legacy picker if 'both' is selected
+                    if (type == "both") {
+                        putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("image/*", "video/*"))
+                    }
+                }
 
-        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-        activity.startActivityForResult(intent, PICKER_REQUEST_CODE)
+            try {
+                activity.startActivityForResult(
+                    Intent.createChooser(fallbackIntent, "Select Media"),
+                    PICKER_REQUEST_CODE,
+                )
+            } catch (fallbackEx: Exception) {
+                pickerPromise?.reject("E_NO_PICKER", "No app available to pick media")
+                cleanup()
+            }
+        }
     }
 
     private fun launchCamera(

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-mediapicker",
-    "version": "0.0.5",
+    "version": "0.0.6",
     "description": "High-performance React Native module for picking media on Android and iOS.",
     "main": "index.js",
     "types": "index.d.ts",