Merge pull request #14524 from nextcloud/use-correct-permissions

Check API Level for READ_MEDIA_VISUAL_USER_SELECTED Permission

Author: tobiasKaminsky

app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt

@@ -75,7 +75,7 @@ class MediaFoldersDetectionWork constructor(
 
     private val randomIdGenerator = Random(clock.currentTime)
 
-    @Suppress("LongMethod", "ComplexMethod", "NestedBlockDepth") // legacy code
+    @Suppress("LongMethod", "ComplexMethod", "NestedBlockDepth", "ReturnCount") // legacy code
     override fun doWork(): Result {
         val arbitraryDataProvider: ArbitraryDataProvider = ArbitraryDataProviderImpl(context)
         val gson = Gson()

app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt

@@ -137,6 +137,7 @@ object PermissionUtil {
      * Request a storage permission
      */
     // TODO inject this class to avoid passing ViewThemeUtils around
+    @Suppress("NestedBlockDepth")
     private fun requestStoragePermission(
         activity: Activity,
         readOnly: Boolean,
@@ -150,11 +151,18 @@ object PermissionUtil {
             val permissions = if (readOnly && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                     // use granular media permissions
-                    arrayOf(
-                        Manifest.permission.READ_MEDIA_IMAGES,
-                        Manifest.permission.READ_MEDIA_VIDEO,
-                        Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
-                    )
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                        arrayOf(
+                            Manifest.permission.READ_MEDIA_IMAGES,
+                            Manifest.permission.READ_MEDIA_VIDEO,
+                            Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
+                        )
+                    } else {
+                        arrayOf(
+                            Manifest.permission.READ_MEDIA_IMAGES,
+                            Manifest.permission.READ_MEDIA_VIDEO
+                        )
+                    }
                 } else {
                     arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE)
                 }
@@ -311,6 +319,7 @@ object PermissionUtil {
      *
      * @param activity target activity
      */
+    @Suppress("ReturnCount")
     @JvmStatic
     fun requestMediaLocationPermission(activity: Activity) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {

scripts/analysis/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 3 errors and 55 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 3 errors and 54 warnings</span>