PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

moving some functions into background thread

Browse source
This commit is contained in:
tibbi 2021-02-19 18:47:38 +01:00
parent 8fc4fc2f88
commit 2cf4735767
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt
View file

@ -559,9 +559,15 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener {
} }
private fun deleteDirectoryIfEmpty() { private fun deleteDirectoryIfEmpty() {
val fileDirItem = FileDirItem(mPath, mPath.getFilenameFromPath(), true) if (config.deleteEmptyFolders) {
if (config.deleteEmptyFolders && !fileDirItem.isDownloadsFolder() && fileDirItem.isDirectory && fileDirItem.getProperFileCount(this, true) == 0) { val fileDirItem = FileDirItem(mPath, mPath.getFilenameFromPath(), true)
tryDeleteFileDirItem(fileDirItem, true, true) if (!fileDirItem.isDownloadsFolder() && fileDirItem.isDirectory) {
ensureBackgroundThread {
if (fileDirItem.getProperFileCount(this, true) == 0) {
tryDeleteFileDirItem(fileDirItem, true, true)
}
}
}
} }
} }

14
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
View file

@ -1163,12 +1163,14 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
} }
private fun deleteDirectoryIfEmpty() { private fun deleteDirectoryIfEmpty() {
val fileDirItem = FileDirItem(mDirectory, mDirectory.getFilenameFromPath(), File(mDirectory).isDirectory) if (config.deleteEmptyFolders) {
if (config.deleteEmptyFolders && !fileDirItem.isDownloadsFolder() && fileDirItem.isDirectory) { val fileDirItem = FileDirItem(mDirectory, mDirectory.getFilenameFromPath(), File(mDirectory).isDirectory)
ensureBackgroundThread { if (!fileDirItem.isDownloadsFolder() && fileDirItem.isDirectory) {
if (fileDirItem.getProperFileCount(this, true) == 0) { ensureBackgroundThread {
tryDeleteFileDirItem(fileDirItem, true, true) if (fileDirItem.getProperFileCount(this, true) == 0) {
scanPathRecursively(mDirectory) tryDeleteFileDirItem(fileDirItem, true, true)
scanPathRecursively(mDirectory)
}
} }
} }
} }

4
app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt
View file

@ -158,7 +158,9 @@ fun BaseSimpleActivity.addNoMedia(path: String, callback: () -> Unit) {
} else { } else {
try { try {
if (file.createNewFile()) { if (file.createNewFile()) {
addNoMediaIntoMediaStore(file.absolutePath) ensureBackgroundThread {
addNoMediaIntoMediaStore(file.absolutePath)
}
} else { } else {
toast(R.string.unknown_error_occurred) toast(R.string.unknown_error_occurred)
} }