From 5064ca612f3e6328394d41b914994d461e4b0ed3 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 3 Mar 2017 21:29:51 +0100
Subject: [PATCH] lets always show the exclude confirmation dialog

---
 .../simplemobiletools/gallery/activities/MediaActivity.kt  | 7 +------
 .../simplemobiletools/gallery/adapters/DirectoryAdapter.kt | 7 +------
 .../kotlin/com/simplemobiletools/gallery/helpers/Config.kt | 4 ----
 .../com/simplemobiletools/gallery/helpers/Constants.kt     | 1 -
 4 files changed, 2 insertions(+), 17 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 997918b67..7ac53d1e4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -193,13 +193,8 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     }
 
     private fun tryExcludeFolder() {
-        if (config.wasExcludeFolderTooltipShown) {
+        ConfirmationDialog(this, getString(R.string.exclude_folder_description)) {
             excludeFolder()
-        } else {
-            ConfirmationDialog(this, getString(R.string.exclude_folder_description)) {
-                config.wasExcludeFolderTooltipShown = true
-                excludeFolder()
-            }
         }
     }
 
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 59bd6b8a9..cfd5d1652 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -196,13 +196,8 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
     }
 
     private fun tryExcludeFolder() {
-        if (config.wasExcludeFolderTooltipShown) {
+        ConfirmationDialog(activity, activity.getString(R.string.exclude_folder_description)) {
             excludeFolder()
-        } else {
-            ConfirmationDialog(activity, activity.getString(R.string.exclude_folder_description)) {
-                config.wasExcludeFolderTooltipShown = true
-                excludeFolder()
-            }
         }
     }
 
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 10e2f63b1..7ca1e9460 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
@@ -38,10 +38,6 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getBoolean(HIDE_FOLDER_TOOLTIP_SHOWN, false)
         set(wasShown) = prefs.edit().putBoolean(HIDE_FOLDER_TOOLTIP_SHOWN, wasShown).apply()
 
-    var wasExcludeFolderTooltipShown: Boolean
-        get() = prefs.getBoolean(EXCLUDE_FOLDER_TOOLTIP_SHOWN, false)
-        set(wasShown) = prefs.edit().putBoolean(EXCLUDE_FOLDER_TOOLTIP_SHOWN, wasShown).apply()
-
     var showHiddenFolders: Boolean
         get() = prefs.getBoolean(SHOW_HIDDEN_FOLDERS, false)
         set(showHiddenFolders) = prefs.edit().putBoolean(SHOW_HIDDEN_FOLDERS, showHiddenFolders).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 8eb140cd1..6fed4add7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
@@ -16,7 +16,6 @@ val SHOW_ALL = "show_all"   // display images and videos from all folders togeth
 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"