Merge pull request #2415 from KryptKode/fix/restore_to_android_folder_sdk_30

fix: restore to android folder on SDK30
This commit is contained in:
Tibor Kaputa 2022-04-16 13:49:33 +02:00 committed by GitHub
commit 108ecf3c8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -346,10 +346,8 @@ fun BaseSimpleActivity.restoreRecycleBinPaths(paths: ArrayList<String>, callback
var destination = source.removePrefix(recycleBinPath)
val destinationParent = destination.getParentPath()
val isAStorageRootFolder = isAStorageRootFolder(destinationParent)
if (isRPlus() && isAStorageRootFolder) {
// if the file is on the root of Internal Storage or SD Card, change it to Pictures
// we cannot write there on 30+
if (isRestrictedWithSAFSdk30(destinationParent) && !isInDownloadDir(destinationParent)) {
// if the file is not writeable on SDK30+, change it to Pictures
val picturesDirectory = getPicturesDirectoryPath(destination)
destination = File(picturesDirectory, destination.getFilenameFromPath()).path
if (!shownRestoringToPictures) {