Remove media permissions to make complaint with Android 14 requirements

This is cherry-pick and backport of a non-final implementation of PR apache#889 WR-Issue: #17891
webratio · Oct 16, 2024 · 0ffb278 · 0ffb278
1 parent 0b6c858
commit 0ffb278
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -55,8 +55,6 @@
         </config-file>
         <config-file target="AndroidManifest.xml" parent="/*">
             <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-            <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-            <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
             <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />
         </config-file>
         <config-file target="AndroidManifest.xml" parent="application">

diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
@@ -220,18 +220,11 @@ else if ((this.srcType == PHOTOLIBRARY) || (this.srcType == SAVEDPHOTOALBUM)) {
     //--------------------------------------------------------------------------
 
     private String[] getStoragePermissions(int mediaType) {
-        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            switch (mediaType) {
-                case PICTURE:
-                    return new String[]{ Manifest.permission.READ_MEDIA_IMAGES };
-                case VIDEO:
-                    return new String[]{ Manifest.permission.READ_MEDIA_VIDEO };
-                default:
-                    return new String[]{ Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO };
-            }
-        } else {
+        if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
+            // Android API 30 or lower
             return new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
         }
+        return new String[0];
     }
 
     private boolean hasPermissions(String[] permissions) {