fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent c82a683302 5e4550d52b
commit 108ecf3c8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt
View File

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