Merge pull request #128 from wordpress-mobile/fix/camera-and-storage-permissions

Fix/camera and storage permissions

Author: irfano

WordPressUtils/src/main/java/org/wordpress/android/util/PermissionUtils.java

@@ -1,12 +1,10 @@
 package org.wordpress.android.util;
 
-import android.Manifest;
 import android.Manifest.permission;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.os.Build.VERSION_CODES;
 
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
@@ -63,67 +61,73 @@ private static boolean checkAndRequestPermissions(Fragment fragment, int request
      *
      * @return true if all permissions are granted
      */
-    public static boolean checkPermissions(Activity activity, String[] permissionList) {
+    public static boolean checkPermissions(Context context, String[] permissionList) {
         for (String permission : permissionList) {
-            if (ContextCompat.checkSelfPermission(activity, permission) != PackageManager.PERMISSION_GRANTED) {
+            if (ContextCompat.checkSelfPermission(context, permission) != PackageManager.PERMISSION_GRANTED) {
                 return false;
             }
         }
         return true;
     }
 
+    /**
+     * Check for permissions without requesting them
+     *
+     * @return true if all permissions are granted
+     */
+    public static boolean checkPermissions(Activity activity, String[] permissionList) {
+        return checkPermissions((Context) activity, permissionList);
+    }
+
+    public static boolean checkCameraAndStoragePermissions(Context context) {
+        return checkPermissions(context, getCameraAndStoragePermissions());
+    }
+
     public static boolean checkCameraAndStoragePermissions(Activity activity) {
-        return checkPermissions(activity,
-                new String[]{
-                        permission.WRITE_EXTERNAL_STORAGE,
-                        permission.CAMERA});
+        return checkPermissions(activity, getCameraAndStoragePermissions());
     }
 
     public static boolean checkNotificationsPermission(Activity activity) {
-        if (Build.VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             return checkPermissions(activity, new String[]{permission.POST_NOTIFICATIONS});
         } else {
             return true;
         }
     }
 
     public static boolean checkAndRequestCameraAndStoragePermissions(Fragment fragment, int requestCode) {
-        String[] permissions;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            permissions = new String[]{Manifest.permission.CAMERA};
-        } else {
-            permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE};
-        }
-        return checkAndRequestPermissions(fragment, requestCode, permissions);
+        return checkAndRequestPermissions(fragment, requestCode, getCameraAndStoragePermissions());
     }
 
     public static boolean checkAndRequestCameraAndStoragePermissions(Activity activity, int requestCode) {
-        String[] permissions;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            permissions = new String[]{Manifest.permission.CAMERA};
-        } else {
-            permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE};
-        }
-        return checkAndRequestPermissions(activity, requestCode, permissions);
+        return checkAndRequestPermissions(activity, requestCode, getCameraAndStoragePermissions());
     }
 
     public static boolean checkAndRequestStoragePermission(Activity activity, int requestCode) {
-        String[] permissions;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            permissions = new String[]{Manifest.permission.CAMERA};
+        return checkAndRequestPermissions(activity, requestCode, getStoragePermissions());
+    }
+
+    public static boolean checkAndRequestStoragePermission(Fragment fragment, int requestCode) {
+        return checkAndRequestPermissions(fragment, requestCode, getStoragePermissions());
+    }
+
+    public static String[] getCameraAndStoragePermissions() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            return new String[]{permission.CAMERA, permission.READ_MEDIA_IMAGES, permission.READ_MEDIA_VIDEO};
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            return new String[]{permission.CAMERA, permission.READ_EXTERNAL_STORAGE};
         } else {
-            permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE};
+            return new String[]{permission.CAMERA, permission.WRITE_EXTERNAL_STORAGE, permission.READ_EXTERNAL_STORAGE};
         }
-        return checkAndRequestPermissions(activity, requestCode, permissions);
     }
 
-    public static boolean checkAndRequestStoragePermission(Fragment fragment, int requestCode) {
-        String[] permissions;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            permissions = new String[]{Manifest.permission.CAMERA};
+    private static String[] getStoragePermissions() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            return new String[]{permission.READ_MEDIA_IMAGES, permission.READ_MEDIA_VIDEO};
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            return new String[]{permission.READ_EXTERNAL_STORAGE};
         } else {
-            permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE};
+            return new String[]{permission.READ_EXTERNAL_STORAGE, permission.WRITE_EXTERNAL_STORAGE};
         }
-        return checkAndRequestPermissions(fragment, requestCode, permissions);
     }
 }