fenix/Simple-Gallery
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git synced 2025-06-05 21:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

update the deletefiles function with stdlib

Browse Source
This commit is contained in:
tibbi
2016-12-07 20:37:37 +01:00
parent b28f7dcc78
commit 5df874ff43
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
View File

@ -199,23 +199,22 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
} }
override fun deleteFiles(files: ArrayList<File>) { override fun deleteFiles(files: ArrayList<File>) {
for (file in files) { files.filter { it.exists() && it.isImageVideoGif() }
if (file.exists() && file.isImageVideoGif()) { .forEach {
if (needsStupidWritePermissions(file.absolutePath)) { if (needsStupidWritePermissions(it.absolutePath)) {
if (isShowingPermDialog(file)) if (isShowingPermDialog(it))
return return
val document = getFileDocument(file.absolutePath, mConfig.treeUri) val document = getFileDocument(it.absolutePath, mConfig.treeUri)
// double check we have the uri to the proper file path, not some parent folder // double check we have the uri to the proper file path, not some parent folder
if (document.uri.toString().endsWith(file.absolutePath.getFilenameFromPath()) && !document.isDirectory) { if (document.uri.toString().endsWith(it.absolutePath.getFilenameFromPath()) && !document.isDirectory) {
document.delete() document.delete()
}
} else {
it.delete()
} }
} else {
file.delete()
} }
}
}
scanFiles(files) { scanFiles(files) {
if (mMedia.isEmpty()) { if (mMedia.isEmpty()) {