WIP - READ_MEDIA_VISUAL_USER_SELECTED

jameshnsears · Aug 31, 2023 · 1a0d16e · 1a0d16e
1 parent bc037b3
commit 1a0d16e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
-
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application

diff --git a/module/permissions/src/main/AndroidManifest.xml b/module/permissions/src/main/AndroidManifest.xml
@@ -1,2 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+<!--    <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />-->
+<!--    <uses-permission-->
+<!--        android:name="android.permission.READ_EXTERNAL_STORAGE"-->
+<!--        android:maxSdkVersion="33" />-->
+    <uses-permission
+        android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED"/>
+
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+</manifest>
diff --git a/...ava/com/github/jameshnsears/cameraoverlay/view/main/permission/PermissionButtonStorage.kt b/...ava/com/github/jameshnsears/cameraoverlay/view/main/permission/PermissionButtonStorage.kt
@@ -5,6 +5,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.provider.Settings
 import android.widget.Toast
 import androidx.activity.compose.ManagedActivityResultLauncher
@@ -65,8 +66,13 @@ fun PermissionButtonStorage(viewModelPermission: ViewModelPermission) {
 
             if (buttonEnabled.value) {
                 if (permissionPrompt.value == PermissionPrompt.PERMISSION_DIALOG) {
-                    launcherRequestPermissionAccessPhotos
-                        .launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                        launcherRequestPermissionAccessPhotos
+                            .launch(Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED)
+                    } else {
+                        launcherRequestPermissionAccessPhotos
+                            .launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+                    }
                 } else {
                     launcherAppInfoAccessPhotos
                         .launch(