From 4572295698a135d8c617fcaf9680f304148a0fd4 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 26 Feb 2017 19:31:20 +0100
Subject: [PATCH] add the exclusion functionality

---
 .../gallery/activities/MediaActivity.kt            |  3 ++-
 .../gallery/adapters/DirectoryAdapter.kt           |  4 +++-
 .../gallery/asynctasks/GetDirectoriesAsynctask.kt  |  7 +++++++
 .../simplemobiletools/gallery/helpers/Config.kt    | 14 ++++++++++++++
 .../simplemobiletools/gallery/helpers/Constants.kt |  1 +
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index c9400fa73..6d9fcf2ee 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -179,7 +179,8 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     }
 
     private fun excludeFolder() {
-
+        config.addExcludedFolder(mPath)
+        finish()
     }
 
     private fun deleteDirectoryIfEmpty() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index fee67945e..009cdc287 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -197,7 +197,9 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
     }
 
     private fun excludeFolder() {
-
+        activity.config.addExcludedFolders(getSelectedPaths())
+        listener?.refreshItems()
+        actMode?.finish()
     }
 
     private fun noMediaHandled() {
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 2dd0e0f76..49229ce96 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetDirectoriesAsynctask.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetDirectoriesAsynctask.kt
@@ -23,6 +23,7 @@ class GetDirectoriesAsynctask(val context: Context, val isPickVideo: Boolean, va
         val showMedia = config.showMedia
         val fileSorting = config.fileSorting
         val parents = context.getParents()
+        removeExcludedFolders(parents)
 
         parents.forEach {
             val filenames = File(it).list()
@@ -92,6 +93,12 @@ class GetDirectoriesAsynctask(val context: Context, val isPickVideo: Boolean, va
         return directories
     }
 
+    private fun removeExcludedFolders(paths: MutableList<String>) {
+        val excludedPaths = config.excludedFolders
+        val ignorePaths = paths.filter { excludedPaths.contains(it) }
+        paths.removeAll(ignorePaths)
+    }
+
     private fun movePinnedToFront(dirs: ArrayList<Directory>): ArrayList<Directory> {
         val foundFolders = ArrayList<Directory>()
         val pinnedFolders = config.pinnedFolders
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
index 4392c4bd6..864cd40ca 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
@@ -54,6 +54,20 @@ class Config(context: Context) : BaseConfig(context) {
         pinnedFolders = currPinnedFolders
     }
 
+    fun addExcludedFolder(path: String) {
+        addExcludedFolders(HashSet<String>(Arrays.asList(path)))
+    }
+
+    fun addExcludedFolders(paths: Set<String>) {
+        val currExcludedFolders = HashSet<String>(excludedFolders)
+        currExcludedFolders.addAll(paths)
+        excludedFolders = currExcludedFolders
+    }
+
+    var excludedFolders: MutableSet<String>
+        get() = prefs.getStringSet(EXCLUDED_FOLDERS, HashSet<String>())
+        set(excludedFolders) = prefs.edit().remove(EXCLUDED_FOLDERS).putStringSet(EXCLUDED_FOLDERS, excludedFolders).apply()
+
     fun saveFolderMedia(path: String, json: String) {
         prefs.edit().putString(SAVE_FOLDER_PREFIX + path, json).apply()
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
index d43d85ef8..85e5dec97 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
@@ -16,6 +16,7 @@ val SHOW_MEDIA = "show_media"
 val SAVE_FOLDER_PREFIX = "folder_"
 val HIDE_FOLDER_TOOLTIP_SHOWN = "hide_folder_tooltip_shown"
 val EXCLUDE_FOLDER_TOOLTIP_SHOWN = "exclude_folder_tooltip_shown"
+val EXCLUDED_FOLDERS = "excluded_folders"
 
 val NOMEDIA = ".nomedia"