mirror of
https://github.com/FossifyOrg/Gallery.git
synced 2024-11-26 22:47:59 +01:00
adding some recycle bin refreshing related improvements
This commit is contained in:
parent
3e729ba6fe
commit
50e6b98d09
1 changed files with 11 additions and 1 deletions
|
@ -942,6 +942,16 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
|
||||||
val lastModifieds = mLastMediaFetcher!!.getLastModifieds()
|
val lastModifieds = mLastMediaFetcher!!.getLastModifieds()
|
||||||
val dateTakens = mLastMediaFetcher!!.getDateTakens()
|
val dateTakens = mLastMediaFetcher!!.getDateTakens()
|
||||||
|
|
||||||
|
if (config.showRecycleBinAtFolders && !config.showRecycleBinLast && !dirs.map { it.path }.contains(RECYCLE_BIN)) {
|
||||||
|
val recycleBin = Directory().apply {
|
||||||
|
path = RECYCLE_BIN
|
||||||
|
name = getString(R.string.recycle_bin)
|
||||||
|
location = LOCATION_INTERNAL
|
||||||
|
}
|
||||||
|
|
||||||
|
dirs.add(0, recycleBin)
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
for (directory in dirs) {
|
for (directory in dirs) {
|
||||||
if (mShouldStopFetching || isDestroyed || isFinishing) {
|
if (mShouldStopFetching || isDestroyed || isFinishing) {
|
||||||
|
@ -1044,7 +1054,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
|
||||||
foldersToScan.remove(RECYCLE_BIN)
|
foldersToScan.remove(RECYCLE_BIN)
|
||||||
}
|
}
|
||||||
|
|
||||||
dirs.forEach {
|
dirs.filterNot { it.path == RECYCLE_BIN }.forEach {
|
||||||
foldersToScan.remove(it.path)
|
foldersToScan.remove(it.path)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue