[Android] Permissions: fix canReadVideos/Audio for API30-

[Duncan McNamara]

vlc-android | branch: master | Duncan McNamara <dcn.mcnamara at gmail.com> | Tue Feb 18 17:58:52 2025 +0100| [5d7df7ee1feda5b2a7677865a253827322b71d31] | committer: Nicolas Pomepuy

Permissions: fix canReadVideos/Audio for API30-

> https://code.videolan.org/videolan/vlc-android/commit/5d7df7ee1feda5b2a7677865a253827322b71d31
---

 .../src/org/videolan/vlc/util/Permissions.kt           | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/application/vlc-android/src/org/videolan/vlc/util/Permissions.kt b/application/vlc-android/src/org/videolan/vlc/util/Permissions.kt
index cb2a3ef405..c26f5111c7 100644
--- a/application/vlc-android/src/org/videolan/vlc/util/Permissions.kt
+++ b/application/vlc-android/src/org/videolan/vlc/util/Permissions.kt
@@ -112,12 +112,11 @@ object Permissions {
     }
 
     fun canReadVideos(context: Context): Boolean {
-        return Build.VERSION.SDK_INT < Build.VERSION_CODES.R && isExternalStorageManager() ||
-                ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) &&
-                        (ContextCompat.checkSelfPermission(
+        return Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU &&
+                (ContextCompat.checkSelfPermission(
                     context,
                     Manifest.permission.READ_EXTERNAL_STORAGE
-                ) == PackageManager.PERMISSION_GRANTED || isExternalStorageManager())) ||
+                ) == PackageManager.PERMISSION_GRANTED || isExternalStorageManager()) ||
                 (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && (ContextCompat.checkSelfPermission(
                     context,
                     Manifest.permission.READ_MEDIA_VIDEO
@@ -126,12 +125,11 @@ object Permissions {
     }
 
     fun canReadAudios(context: Context): Boolean {
-        return Build.VERSION.SDK_INT < Build.VERSION_CODES.R && isExternalStorageManager() ||
-                ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) &&
-                        (ContextCompat.checkSelfPermission(
-                            context,
-                            Manifest.permission.READ_EXTERNAL_STORAGE
-                        ) == PackageManager.PERMISSION_GRANTED || isExternalStorageManager())) ||
+        return Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU &&
+                (ContextCompat.checkSelfPermission(
+                    context,
+                    Manifest.permission.READ_EXTERNAL_STORAGE
+                ) == PackageManager.PERMISSION_GRANTED || isExternalStorageManager()) ||
                 (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && (ContextCompat.checkSelfPermission(
                     context,
                     Manifest.permission.READ_MEDIA_AUDIO