From bc5f0ce175168555d4b9aa4a050f5c0fc25b8057 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Sat, 16 Apr 2022 10:12:34 +0100 Subject: [PATCH] handle picking restricted folders in PickDirectoryDialog - users should not be able to pick restricted folders in PickDirectoryDialog when copying/moving files on SDK 30+ - show nice error message R.string.system_folder_restriction when user picks a restricted folder on SDK 30+ - restricted folders on SDK 30+ are: Android, Root of Internal and SDCard. The Download directory is writable --- .../gallery/pro/dialogs/PickDirectoryDialog.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickDirectoryDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickDirectoryDialog.kt index 011bcfe00..8f8f25f66 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickDirectoryDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/PickDirectoryDialog.kt @@ -8,7 +8,6 @@ import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID -import com.simplemobiletools.commons.helpers.isRPlus import com.simplemobiletools.commons.views.MyGridLayoutManager import com.simplemobiletools.gallery.pro.R import com.simplemobiletools.gallery.pro.adapters.DirectoryAdapter @@ -112,7 +111,7 @@ class PickDirectoryDialog( if (path.trimEnd('/') == sourcePath) { activity.toast(R.string.source_and_destination_same) return@DirectoryAdapter - } else if (isRPlus() && activity.isAStorageRootFolder(path)) { + } else if (activity.isRestrictedWithSAFSdk30(path) && !activity.isInDownloadDir(path)) { activity.toast(R.string.system_folder_restriction, Toast.LENGTH_LONG) return@DirectoryAdapter } else {