diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt index 0996f0a5d..6863489fd 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt @@ -195,11 +195,8 @@ object PermissionManager { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { // cf https://developer.android.com/about/versions/11/privacy/storage#directory-access dirs.add(Environment.DIRECTORY_DOWNLOADS) - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { - // by observation, no documentation - dirs.add("Android") - } + // depends on device, no documentation + dirs.add("Android") } return dirs } diff --git a/lib/services/storage_service.dart b/lib/services/storage_service.dart index f6213df05..861b1dee0 100644 --- a/lib/services/storage_service.dart +++ b/lib/services/storage_service.dart @@ -28,7 +28,7 @@ abstract class StorageService { // returns whether user granted access to a directory of his choosing Future requestDirectoryAccess(String path); - Future canRequestMediaFileAccess(); + Future canRequestMediaFileBulkAccess(); Future canInsertMedia(Set directories); @@ -146,7 +146,7 @@ class PlatformStorageService implements StorageService { } @override - Future canRequestMediaFileAccess() async { + Future canRequestMediaFileBulkAccess() async { try { final result = await _platform.invokeMethod('canRequestMediaFileBulkAccess'); if (result != null) return result as bool; diff --git a/lib/widgets/common/action_mixins/permission_aware.dart b/lib/widgets/common/action_mixins/permission_aware.dart index 79caaf0b8..2e7d1e331 100644 --- a/lib/widgets/common/action_mixins/permission_aware.dart +++ b/lib/widgets/common/action_mixins/permission_aware.dart @@ -20,7 +20,7 @@ mixin PermissionAwareMixin { final restrictedInaccessibleDirs = dirs.where(restrictedDirs.contains).toSet(); if (restrictedInaccessibleDirs.isNotEmpty) { - if (entries != null && await storageService.canRequestMediaFileAccess()) { + if (entries != null && await storageService.canRequestMediaFileBulkAccess()) { // request media file access for items in restricted directories final uris = [], mimeTypes = []; entries.where((entry) {