Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2025-01-19 06:48:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix hiding folders when Show Hidden Items is disabled

Browse source
This commit is contained in:
tibbi 2018-04-09 14:28:11 +02:00
parent 2b37c315f1
commit 79dfab5efa
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
View file

@ -224,8 +224,9 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
updateFolderNames() updateFolderNames()
} else { } else {
val affectedPositions = ArrayList<Int>() val affectedPositions = ArrayList<Int>()
val includedFolders = activity.config.includedFolders
val newDirs = dirs.filterIndexed { index, directory -> val newDirs = dirs.filterIndexed { index, directory ->
val removeDir = directory.path.startsWith(path, true) val removeDir = File(directory.path).doesThisOrParentHaveNoMedia() && !includedFolders.contains(directory.path)
if (removeDir) { if (removeDir) {
affectedPositions.add(index) affectedPositions.add(index)
} }
@ -234,7 +235,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
activity.runOnUiThread { activity.runOnUiThread {
affectedPositions.sortedDescending().forEach { affectedPositions.sortedDescending().forEach {
notifyItemRemoved(it + positionOffset) notifyItemRemoved(it)
itemViews.put(it, null) itemViews.put(it, null)
} }
@ -245,6 +246,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
currentDirectoriesHash = newDirs.hashCode() currentDirectoriesHash = newDirs.hashCode()
itemViews = newItems itemViews = newItems
dirs = newDirs
finishActMode() finishActMode()
fastScroller?.measureRecyclerView() fastScroller?.measureRecyclerView()
listener?.updateDirectories(newDirs, false) listener?.updateDirectories(newDirs, false)