SES-4564 : Limited Image Access Not Working (#1498)

* Fixed and optimized gallery access

* Added context variable

Author: jbsession

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java

@@ -266,38 +266,75 @@ public static void selectDocument(Activity activity, int requestCode) {
     }
 
     public static void selectGallery(Activity activity, int requestCode, @NonNull Address recipient, @NonNull String body) {
-
         Context c = activity.getApplicationContext();
+        Runnable openGallery = () ->
+                activity.startActivityForResult(
+                        MediaSendActivity.buildGalleryIntent(activity, recipient, body),
+                        requestCode
+                );
+
+        // Android 14+ : if we already have partial OR full access, skip asking
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            if (Permissions.hasAll(activity, Manifest.permission.READ_MEDIA_IMAGES) ||
+                    Permissions.hasAll(activity, Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED)) {
+                openGallery.run();
+                return;
+            }
 
-        Permissions.PermissionsBuilder builder = Permissions.with(activity);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { // API 34+
-            builder = builder.request(Manifest.permission.READ_MEDIA_VIDEO,
-                                    Manifest.permission.READ_MEDIA_IMAGES,
-                                    Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED)
+            Permissions.with(activity)
+                    .request(
+                            Manifest.permission.READ_MEDIA_IMAGES,
+                            Manifest.permission.READ_MEDIA_VIDEO,
+                            Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
+                    )
+                    .onAllGranted(openGallery) // full access granted
+                    .onSomeGranted(granted -> { // treat partial access as success
+                        if (granted.contains(Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED)) {
+                            openGallery.run();
+                        }
+                    })
                     .withPermanentDenialDialog(
                             Phrase.from(c, R.string.permissionsStorageDenied)
-                                    .put(APP_NAME_KEY, c.getString(R.string.app_name))
+                                    .put(APP_NAME_KEY, activity.getString(R.string.app_name))
                                     .format().toString()
-                    );
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {   // API 33
-            builder = builder.request(Manifest.permission.READ_MEDIA_VIDEO,
-                                    Manifest.permission.READ_MEDIA_IMAGES)
+                    )
+                    .execute();
+            return;
+        }
+
+        // Android 13
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.TIRAMISU) {
+            if (Permissions.hasAll(activity,
+                    Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO)) {
+                openGallery.run();
+                return;
+            }
+            Permissions.with(activity)
+                    .request(Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO)
+                    .onAllGranted(openGallery)
                     .withPermanentDenialDialog(
                             Phrase.from(c, R.string.permissionsStorageDenied)
-                                    .put(APP_NAME_KEY, c.getString(R.string.app_name))
-                                    .format().toString()
-                    );
-        } else {
-            builder = builder.request(Manifest.permission.READ_EXTERNAL_STORAGE)
-                    .withPermanentDenialDialog(
-                            Phrase.from(c, R.string.permissionsStorageDeniedLegacy)
-                                    .put(APP_NAME_KEY, c.getString(R.string.app_name))
+                                    .put(APP_NAME_KEY, activity.getString(R.string.app_name))
                                     .format().toString()
-                    );
+                    )
+                    .execute();
+            return;
         }
 
-        builder.onAllGranted(() -> activity.startActivityForResult(MediaSendActivity.buildGalleryIntent(activity, recipient, body), requestCode))
+        // Android 12 and below
+        if (Permissions.hasAll(activity, Manifest.permission.READ_EXTERNAL_STORAGE)) {
+            openGallery.run();
+            return;
+        }
+
+        Permissions.with(activity)
+                .request(Manifest.permission.READ_EXTERNAL_STORAGE)
+                .onAllGranted(openGallery)
+                .withPermanentDenialDialog(
+                        Phrase.from(c, R.string.permissionsStorageDeniedLegacy)
+                                .put(APP_NAME_KEY, activity.getString(R.string.app_name))
+                                .format().toString()
+                )
                 .execute();
     }