capacitor-camera-module 0.0.18 → 0.0.20

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

@@ -34,7 +34,11 @@ import android.net.Uri;
 import android.provider.MediaStore;
 import android.util.Base64;
 
-import androidx.activity.result.ActivityResultContracts;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+
+import android.database.Cursor;
+import android.content.ContentUris;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -52,11 +56,8 @@ import android.graphics.Matrix;
             strings = { Manifest.permission.CAMERA }
         ),
         @Permission(
-        alias = "gallery",
-        strings = {
-        Manifest.permission.READ_MEDIA_IMAGES,
-        Manifest.permission.READ_EXTERNAL_STORAGE
-        }
+            alias = "gallery",
+            strings = { Manifest.permission.READ_MEDIA_IMAGES }
         )
     }
 )
@@ -409,8 +410,27 @@ public class CameraModulePlugin extends Plugin {
 
     @PluginMethod
     public void requestGalleryPermission(PluginCall call) {
-        if (getPermissionState("gallery") != PermissionState.GRANTED) {
-            requestPermissionForAlias("gallery", call, "galleryPermissionCallback");
+        String[] permissionsToRequest;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            permissionsToRequest = new String[]{ Manifest.permission.READ_MEDIA_IMAGES };
+        } else {
+            permissionsToRequest = new String[]{ Manifest.permission.READ_EXTERNAL_STORAGE };
+        }
+
+        // Aquí haces la solicitud manual si no están concedidos
+        boolean granted = true;
+        for (String perm : permissionsToRequest) {
+            if (ContextCompat.checkSelfPermission(getContext(), perm) != PackageManager.PERMISSION_GRANTED) {
+                granted = false;
+                break;
+            }
+        }
+
+        if (!granted) {
+            // Guardar el call y pedir permisos
+            savedCall = call;
+            requestPermissions(permissionsToRequest, "galleryPermissionCallback");
         } else {
             JSObject ret = new JSObject();
             ret.put("granted", true);
@@ -423,7 +443,13 @@ public class CameraModulePlugin extends Plugin {
     @PermissionCallback
     private void galleryPermissionCallback(PluginCall call) {
         JSObject ret = new JSObject();
-        boolean granted = getPermissionState("gallery") == PermissionState.GRANTED;
+
+        boolean granted;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            granted = ContextCompat.checkSelfPermission(getContext(), Manifest.permission.READ_MEDIA_IMAGES) == PackageManager.PERMISSION_GRANTED;
+        } else {
+            granted = ContextCompat.checkSelfPermission(getContext(), Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+        }
 
         ret.put("granted", granted);
         ret.put("status", granted ? "granted" : "denied");

package/package.json

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