request media_location

Signed-off-by: tobiasKaminsky <[email protected]>
nextcloud · Dec 27, 2024 · 42e0bfd · 42e0bfd
1 parent 0b11747
commit 42e0bfd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
     <uses-permission
         android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
         android:maxSdkVersion="25" />
+    <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
     <!--
  Apps that target Android 9 (API level 28) or higher and use foreground services
     must request the FOREGROUND_SERVICE permission

diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -132,7 +132,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.RejectedExecutionException;
 
 import javax.inject.Inject;
 
@@ -491,6 +490,9 @@ public void registerFabListener() {
             // is not available in FolderPickerActivity
             viewThemeUtils.material.themeFAB(mFabMain);
             mFabMain.setOnClickListener(v -> {
+                PermissionUtil.requestMediaLocationPermission(activity);
+
+
                 final OCFileListBottomSheetDialog dialog =
                     new OCFileListBottomSheetDialog(activity,
                                                     this,

diff --git a/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
@@ -39,6 +39,7 @@ object PermissionUtil {
     const val PERMISSIONS_READ_CALENDAR_AUTOMATIC = 6
     const val PERMISSIONS_WRITE_CALENDAR = 7
     const val PERMISSIONS_POST_NOTIFICATIONS = 8
+    const val PERMISSIONS_MEDIA_LOCATION = 9
 
     const val REQUEST_CODE_MANAGE_ALL_FILES = 19203
 
@@ -302,4 +303,23 @@ object PermissionUtil {
             }
         }
     }
+
+    /**
+     * Request media location permission. Required on API level >= 34.
+     * Does not have any effect on API level < 34.
+     *
+     * @param activity target activity
+     */
+    @JvmStatic
+    fun requestMediaLocationPermission(activity: Activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            if (!checkSelfPermission(activity, Manifest.permission.ACCESS_MEDIA_LOCATION)) {
+                ActivityCompat.requestPermissions(
+                    activity,
+                    arrayOf(Manifest.permission.ACCESS_MEDIA_LOCATION),
+                    PERMISSIONS_POST_NOTIFICATIONS
+                )
+            }
+        }
+    }
 }