From 926a45c72e2832a735f47332d8c380d802f48d09 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 7 Jan 2017 16:10:38 +0100 Subject: [PATCH] small get directories style tweak --- .../asynctasks/GetDirectoriesAsynctask.kt | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetDirectoriesAsynctask.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetDirectoriesAsynctask.kt index 8f991c375..1b406663c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetDirectoriesAsynctask.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetDirectoriesAsynctask.kt @@ -130,10 +130,10 @@ class GetDirectoriesAsynctask(val context: Context, val isPickVideo: Boolean, va } private fun filterDirectories(dirs: MutableList) { - if (!mConfig.showHiddenFolders) + if (!mConfig.showHiddenFolders) { removeHiddenFolders(dirs) - - removeNoMediaFolders(dirs) + removeNoMediaFolders(dirs) + } } private fun removeHiddenFolders(dirs: MutableList) { @@ -143,19 +143,16 @@ class GetDirectoriesAsynctask(val context: Context, val isPickVideo: Boolean, va } private fun removeNoMediaFolders(dirs: MutableList) { - val showHiddenFolders = mConfig.showHiddenFolders - if (!showHiddenFolders) { - val ignoreDirs = ArrayList() - for (d in dirs) { - val dir = File(d.path) - if (dir.exists() && dir.isDirectory) { - val res = dir.list { file, filename -> filename == ".nomedia" } - if (res?.isNotEmpty() == true) - ignoreDirs.add(d) - } + val ignoreDirs = ArrayList() + for (d in dirs) { + val dir = File(d.path) + if (dir.exists() && dir.isDirectory) { + val res = dir.list { file, filename -> filename == ".nomedia" } + if (res?.isNotEmpty() == true) + ignoreDirs.add(d) } - - dirs.removeAll(ignoreDirs) } + + dirs.removeAll(ignoreDirs) } }