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

show the recycle bin in some extra cases, if not empty

Browse source
This commit is contained in:
tibbi 2019-09-12 22:51:42 +02:00
parent 1bb3cc54d8
commit 3673378434
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
View file

@ -950,7 +950,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
val foldersToScan = mediaFetcher.getFoldersToScan() val foldersToScan = mediaFetcher.getFoldersToScan()
foldersToScan.add(FAVORITES) foldersToScan.add(FAVORITES)
if (config.useRecycleBin && config.showRecycleBinAtFolders) { if (config.showRecycleBinAtFolders) {
foldersToScan.add(RECYCLE_BIN) foldersToScan.add(RECYCLE_BIN)
} else { } else {
foldersToScan.remove(RECYCLE_BIN) foldersToScan.remove(RECYCLE_BIN)

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

@ -143,7 +143,7 @@ fun Context.movePinnedDirectoriesToFront(dirs: ArrayList<Directory>): ArrayList<
} }
} }
if (config.useRecycleBin && config.showRecycleBinAtFolders && config.showRecycleBinLast) { if (config.showRecycleBinAtFolders && config.showRecycleBinLast) {
val binIndex = dirs.indexOfFirst { it.isRecycleBin() } val binIndex = dirs.indexOfFirst { it.isRecycleBin() }
if (binIndex != -1) { if (binIndex != -1) {
val bin = dirs.removeAt(binIndex) val bin = dirs.removeAt(binIndex)
@ -566,7 +566,7 @@ fun Context.getCachedDirectories(getVideosOnly: Boolean = false, getImagesOnly:
ArrayList<Directory>() ArrayList<Directory>()
} }
if (!config.showRecycleBinAtFolders || !config.useRecycleBin) { if (!config.showRecycleBinAtFolders) {
directories.removeAll { it.isRecycleBin() } directories.removeAll { it.isRecycleBin() }
} }