From 267fb6551b2f5d71107ed0efb7f51497d76b2c27 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 1 Sep 2021 21:10:52 +1000
Subject: [PATCH 1/8] add File Content Search Enabled status property

---
 .../Search/SearchManager.cs                       |  6 +++---
 Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
index d367eddca..9256a3917 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -75,10 +75,10 @@ namespace Flow.Launcher.Plugin.Explorer.Search
                                                               keyword == Settings.SearchActionKeyword,
                 Settings.ActionKeyword.PathSearchActionKeyword => Settings.PathSearchKeywordEnabled &&
                                                                   keyword == Settings.PathSearchActionKeyword,
-                Settings.ActionKeyword.FileContentSearchActionKeyword => keyword ==
-                                                                         Settings.FileContentSearchActionKeyword,
+                Settings.ActionKeyword.FileContentSearchActionKeyword => Settings.FileContentSearchKeywordEnabled &&
+                                                                         keyword == Settings.FileContentSearchActionKeyword,
                 Settings.ActionKeyword.IndexSearchActionKeyword => Settings.IndexOnlySearchKeywordEnabled &&
-                                                                       keyword == Settings.IndexSearchActionKeyword
+                                                                   keyword == Settings.IndexSearchActionKeyword
             };
         }
 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
index 88656a401..e44980b23 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
@@ -25,6 +25,8 @@ namespace Flow.Launcher.Plugin.Explorer
 
         public string FileContentSearchActionKeyword { get; set; } = Constants.DefaultContentSearchActionKeyword;
 
+        public bool FileContentSearchKeywordEnabled { get; set; } = true;
+
         public string PathSearchActionKeyword { get; set; } = Query.GlobalPluginWildcardSign;
 
         public bool PathSearchKeywordEnabled { get; set; }
@@ -48,7 +50,8 @@ namespace Flow.Launcher.Plugin.Explorer
             ActionKeyword.SearchActionKeyword => SearchActionKeyword,
             ActionKeyword.PathSearchActionKeyword => PathSearchActionKeyword,
             ActionKeyword.FileContentSearchActionKeyword => FileContentSearchActionKeyword,
-            ActionKeyword.IndexSearchActionKeyword => IndexSearchActionKeyword
+            ActionKeyword.IndexSearchActionKeyword => IndexSearchActionKeyword,
+            _ => throw new ArgumentOutOfRangeException(nameof(actionKeyword), actionKeyword, "ActionKeyWord property not found")
         };
 
         internal void SetActionKeyword(ActionKeyword actionKeyword, string keyword) => _ = actionKeyword switch
@@ -57,15 +60,16 @@ namespace Flow.Launcher.Plugin.Explorer
             ActionKeyword.PathSearchActionKeyword => PathSearchActionKeyword = keyword,
             ActionKeyword.FileContentSearchActionKeyword => FileContentSearchActionKeyword = keyword,
             ActionKeyword.IndexSearchActionKeyword => IndexSearchActionKeyword = keyword,
-            _ => throw new ArgumentOutOfRangeException(nameof(actionKeyword), actionKeyword, "Unexpected property")
+            _ => throw new ArgumentOutOfRangeException(nameof(actionKeyword), actionKeyword, "ActionKeyWord property not found")
         };
 
-        internal bool? GetActionKeywordEnabled(ActionKeyword actionKeyword) => actionKeyword switch
+        internal bool GetActionKeywordEnabled(ActionKeyword actionKeyword) => actionKeyword switch
         {
             ActionKeyword.SearchActionKeyword => SearchActionKeywordEnabled,
             ActionKeyword.PathSearchActionKeyword => PathSearchKeywordEnabled,
             ActionKeyword.IndexSearchActionKeyword => IndexOnlySearchKeywordEnabled,
-            _ => null
+            ActionKeyword.FileContentSearchActionKeyword => FileContentSearchKeywordEnabled,
+            _ => throw new ArgumentOutOfRangeException(nameof(actionKeyword), actionKeyword, "ActionKeyword enabled status not defined")
         };
 
         internal void SetActionKeywordEnabled(ActionKeyword actionKeyword, bool enable) => _ = actionKeyword switch
@@ -73,7 +77,8 @@ namespace Flow.Launcher.Plugin.Explorer
             ActionKeyword.SearchActionKeyword => SearchActionKeywordEnabled = enable,
             ActionKeyword.PathSearchActionKeyword => PathSearchKeywordEnabled = enable,
             ActionKeyword.IndexSearchActionKeyword => IndexOnlySearchKeywordEnabled = enable,
-            _ => throw new ArgumentOutOfRangeException(nameof(actionKeyword), actionKeyword, "Unexpected property")
+            ActionKeyword.FileContentSearchActionKeyword => FileContentSearchKeywordEnabled = enable,
+            _ => throw new ArgumentOutOfRangeException(nameof(actionKeyword), actionKeyword, "ActionKeyword enabled status not defined")
         };
     }
 }
\ No newline at end of file

From 91564e0933945bd297da679f8279080e41861d53 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 1 Sep 2021 21:17:20 +1000
Subject: [PATCH 2/8] remove null state from action keyword Enabled status

---
 .../Views/ActionKeywordSetting.xaml                    |  2 +-
 .../Views/ActionKeywordSetting.xaml.cs                 | 10 +++++-----
 .../Views/ExplorerSettings.xaml.cs                     |  7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
index 19ff624b0..a497d2b26 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
@@ -31,7 +31,7 @@
                   Margin="10" Grid.Row="0" Grid.Column="2" Content="{DynamicResource plugin_explorer_actionkeyword_enabled}"
                   Width="auto"
                   VerticalAlignment="Center" IsChecked="{Binding Enabled}"
-                  Visibility="{Binding Visible}"/>
+                  Visibility="{Binding EnabledVisibility}"/>
         <Button Name="DownButton"
                 Click="OnDoneButtonClick" Grid.Row="1" Grid.Column="2"
                 Margin="10 0 10 0" Width="80" Height="35"
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
index 18703e5ea..ceb743089 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
@@ -23,18 +23,18 @@ namespace Flow.Launcher.Plugin.Explorer.Views
             set
             {
                 // Set Enable to be true if user change ActionKeyword
-                if (Enabled is not null)
-                    Enabled = true;
+                Enabled = true;
                 _actionKeyword = value;
             }
         }
 
-        public bool? Enabled { get; set; }
+        public bool Enabled { get; set; }
 
         private string _actionKeyword;
 
-        public Visibility Visible =>
-            CurrentActionKeyword.Enabled is not null ? Visibility.Visible : Visibility.Collapsed;
+        public Visibility EnabledVisibility 
+            => CurrentActionKeyword.KeywordProperty == Settings.ActionKeyword.FileContentSearchActionKeyword
+                ? Visibility.Collapsed : Visibility.Visible;
 
         public ActionKeywordSetting(SettingsViewModel settingsViewModel,
             ActionKeywordView selectedActionKeyword)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
index 0c3799cee..abcae97ab 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
@@ -325,7 +325,7 @@ namespace Flow.Launcher.Plugin.Explorer.Views
         }
 
         public string Description { get; private init; }
-        public string Color => Enabled ?? true ? "Black" : "Gray";
+        public string Color => Enabled ? "Black" : "Gray";
 
         internal Settings.ActionKeyword KeywordProperty { get; }
 
@@ -335,11 +335,10 @@ namespace Flow.Launcher.Plugin.Explorer.Views
             set => _settings.SetActionKeyword(KeywordProperty, value);
         }
 
-        public bool? Enabled
+        public bool Enabled
         {
             get => _settings.GetActionKeywordEnabled(KeywordProperty);
-            set => _settings.SetActionKeywordEnabled(KeywordProperty,
-                value ?? throw new ArgumentException("Unexpected null value"));
+            set => _settings.SetActionKeywordEnabled(KeywordProperty, value);
         }
     }
 }
\ No newline at end of file

From 333d3da07fc39f1a4e2af3b63b87fe61f5160a7d Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 1 Sep 2021 21:52:32 +1000
Subject: [PATCH 3/8] remove underscore variable name

---
 .../Views/ActionKeywordSetting.xaml.cs                      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
index ceb743089..cfb68206a 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
@@ -19,18 +19,18 @@ namespace Flow.Launcher.Plugin.Explorer.Views
 
         public string ActionKeyword
         {
-            get => _actionKeyword;
+            get => actionKeyword;
             set
             {
                 // Set Enable to be true if user change ActionKeyword
                 Enabled = true;
-                _actionKeyword = value;
+                actionKeyword = value;
             }
         }
 
         public bool Enabled { get; set; }
 
-        private string _actionKeyword;
+        private string actionKeyword;
 
         public Visibility EnabledVisibility 
             => CurrentActionKeyword.KeywordProperty == Settings.ActionKeyword.FileContentSearchActionKeyword

From b5b21cf43b7d44c0d24bb75881c5a3e572970ede Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 1 Sep 2021 22:05:19 +1000
Subject: [PATCH 4/8] rename IndexOnlySearchKeywordEnabled for consistency

---
 .../Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs   | 2 +-
 Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
index 9256a3917..6f4a0decd 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -77,7 +77,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
                                                                   keyword == Settings.PathSearchActionKeyword,
                 Settings.ActionKeyword.FileContentSearchActionKeyword => Settings.FileContentSearchKeywordEnabled &&
                                                                          keyword == Settings.FileContentSearchActionKeyword,
-                Settings.ActionKeyword.IndexSearchActionKeyword => Settings.IndexOnlySearchKeywordEnabled &&
+                Settings.ActionKeyword.IndexSearchActionKeyword => Settings.IndexSearchKeywordEnabled &&
                                                                    keyword == Settings.IndexSearchActionKeyword
             };
         }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
index e44980b23..668af1612 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
@@ -33,7 +33,7 @@ namespace Flow.Launcher.Plugin.Explorer
 
         public string IndexSearchActionKeyword { get; set; } = Query.GlobalPluginWildcardSign;
 
-        public bool IndexOnlySearchKeywordEnabled { get; set; }
+        public bool IndexSearchKeywordEnabled { get; set; }
 
         public bool WarnWindowsSearchServiceOff { get; set; } = true;
 
@@ -67,7 +67,7 @@ namespace Flow.Launcher.Plugin.Explorer
         {
             ActionKeyword.SearchActionKeyword => SearchActionKeywordEnabled,
             ActionKeyword.PathSearchActionKeyword => PathSearchKeywordEnabled,
-            ActionKeyword.IndexSearchActionKeyword => IndexOnlySearchKeywordEnabled,
+            ActionKeyword.IndexSearchActionKeyword => IndexSearchKeywordEnabled,
             ActionKeyword.FileContentSearchActionKeyword => FileContentSearchKeywordEnabled,
             _ => throw new ArgumentOutOfRangeException(nameof(actionKeyword), actionKeyword, "ActionKeyword enabled status not defined")
         };
@@ -76,7 +76,7 @@ namespace Flow.Launcher.Plugin.Explorer
         {
             ActionKeyword.SearchActionKeyword => SearchActionKeywordEnabled = enable,
             ActionKeyword.PathSearchActionKeyword => PathSearchKeywordEnabled = enable,
-            ActionKeyword.IndexSearchActionKeyword => IndexOnlySearchKeywordEnabled = enable,
+            ActionKeyword.IndexSearchActionKeyword => IndexSearchKeywordEnabled = enable,
             ActionKeyword.FileContentSearchActionKeyword => FileContentSearchKeywordEnabled = enable,
             _ => throw new ArgumentOutOfRangeException(nameof(actionKeyword), actionKeyword, "ActionKeyword enabled status not defined")
         };

From c2758ba7d4be83389d046e50ad1dabd4f6b0961a Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 1 Sep 2021 22:11:08 +1000
Subject: [PATCH 5/8] version bump Explorer

---
 Plugins/Flow.Launcher.Plugin.Explorer/plugin.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
index 1881eff31..43f5867fd 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
@@ -9,7 +9,7 @@
   "Name": "Explorer",
   "Description": "Search and manage files and folders. Explorer utilises Windows Index Search",
   "Author": "Jeremy Wu",
-  "Version": "1.8.4",
+  "Version": "1.8.5",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",

From 0534dece0b3dce63b8d5876a0c0d150bc9258a73 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Thu, 2 Sep 2021 07:47:05 +1000
Subject: [PATCH 6/8] remove comment

---
 .../Views/ActionKeywordSetting.xaml.cs                       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
index cfb68206a..625668d32 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
@@ -74,8 +74,7 @@ namespace Flow.Launcher.Plugin.Explorer.Views
 
             var oldActionKeyword = CurrentActionKeyword.Keyword;
 
-            // == because of nullable
-            if (Enabled == false || !settingsViewModel.IsActionKeywordAlreadyAssigned(ActionKeyword))
+            if (!Enabled || !settingsViewModel.IsActionKeywordAlreadyAssigned(ActionKeyword))
             {
                 // Update View Data
                 CurrentActionKeyword.Keyword = Enabled == true ? ActionKeyword : Query.GlobalPluginWildcardSign;
@@ -84,7 +83,7 @@ namespace Flow.Launcher.Plugin.Explorer.Views
                 switch (Enabled)
                 {
                     // reset to global so it does not take up an action keyword when disabled
-                    //     not for null Enable plugin
+                    // not for null Enable plugin
                     case false when oldActionKeyword != Query.GlobalPluginWildcardSign:
                         settingsViewModel.UpdateActionKeyword(CurrentActionKeyword.KeywordProperty,
                             Query.GlobalPluginWildcardSign, oldActionKeyword);

From ee38561ece4313525f5ee26be33f2bcb4ef6c984 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Fri, 3 Sep 2021 07:47:52 +1000
Subject: [PATCH 7/8] allow File Content search to be toggled on off

---
 Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs             | 2 --
 .../Views/ActionKeywordSetting.xaml                           | 3 +--
 .../Views/ActionKeywordSetting.xaml.cs                        | 4 ----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
index 668af1612..e27abaa93 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
@@ -1,9 +1,7 @@
 using Flow.Launcher.Plugin.Explorer.Search;
 using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
-using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace Flow.Launcher.Plugin.Explorer
 {
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
index a497d2b26..19542dcac 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
@@ -30,8 +30,7 @@
         <CheckBox Name="ChkActionKeywordEnabled" ToolTip="{DynamicResource plugin_explorer_actionkeyword_enabled_tooltip}"
                   Margin="10" Grid.Row="0" Grid.Column="2" Content="{DynamicResource plugin_explorer_actionkeyword_enabled}"
                   Width="auto"
-                  VerticalAlignment="Center" IsChecked="{Binding Enabled}"
-                  Visibility="{Binding EnabledVisibility}"/>
+                  VerticalAlignment="Center" IsChecked="{Binding Enabled}" />
         <Button Name="DownButton"
                 Click="OnDoneButtonClick" Grid.Row="1" Grid.Column="2"
                 Margin="10 0 10 0" Width="80" Height="35"
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
index 625668d32..74516b5e7 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
@@ -32,10 +32,6 @@ namespace Flow.Launcher.Plugin.Explorer.Views
 
         private string actionKeyword;
 
-        public Visibility EnabledVisibility 
-            => CurrentActionKeyword.KeywordProperty == Settings.ActionKeyword.FileContentSearchActionKeyword
-                ? Visibility.Collapsed : Visibility.Visible;
-
         public ActionKeywordSetting(SettingsViewModel settingsViewModel,
             ActionKeywordView selectedActionKeyword)
         {

From b6becee4514195e093764a35c869cd80f5063fe8 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Fri, 3 Sep 2021 09:02:08 +1000
Subject: [PATCH 8/8] Release version bump 1.8.3

Release version bump 1.8.3
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 8f0ceee5b..b45b40186 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: '1.8.2.{build}'
+version: '1.8.3.{build}'
 
 init:
 - ps: |