wbrawner/Simple-Commons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid calling doesThisOrParentHaveNoMedia unnecessarily

Browse source
This commit is contained in:
Naveen 2023-03-13 11:56:48 +05:30
parent 3c0c7ed5be
commit 71ef4cece6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
View file

@ -702,19 +702,19 @@ fun BaseSimpleActivity.deleteFilesBg(files: List<FileDirItem>, allowDeleteFolder
} }
val firstFile = files.first() val firstFile = files.first()
handleSAFDialog(firstFile.path) { val firstFilePath = firstFile.path
handleSAFDialog(firstFilePath) {
if (!it) { if (!it) {
return@handleSAFDialog return@handleSAFDialog
} }
checkManageMediaOrHandleSAFDialogSdk30(firstFile.path) { checkManageMediaOrHandleSAFDialogSdk30(firstFilePath) {
if (!it) { if (!it) {
return@checkManageMediaOrHandleSAFDialogSdk30 return@checkManageMediaOrHandleSAFDialogSdk30
} }
val recycleBinPath = firstFile.isRecycleBinPath(this) val recycleBinPath = firstFile.isRecycleBinPath(this)
val containsNoMedia = firstFile.path.doesThisOrParentHaveNoMedia(HashMap(), null) if (canManageMedia() && !recycleBinPath && !firstFilePath.doesThisOrParentHaveNoMedia(HashMap(), null)) {
if (canManageMedia() && !recycleBinPath && !containsNoMedia) {
val fileUris = getFileUrisFromFileDirItems(files) val fileUris = getFileUrisFromFileDirItems(files)
deleteSDK30Uris(fileUris) { success -> deleteSDK30Uris(fileUris) { success ->