Add Windows clipboard enabled check

Author: Jack251970

Diff for: src/Flow.Launcher.Plugin.ClipboardPlus.Core/Helpers/WindowsClipboardHelper.cs

@@ -84,6 +84,7 @@ public WindowsClipboardHelper()
         {
             Clipboard_HistoryChanged(this, null!);
             Windows.ApplicationModel.DataTransfer.Clipboard.HistoryChanged += Clipboard_HistoryChanged;
+            Windows.ApplicationModel.DataTransfer.Clipboard.HistoryEnabledChanged += Clipboard_HistoryEnabledChanged;
         }
     }
 
@@ -100,6 +101,8 @@ public void SetClipboardPlus(IClipboardPlus clipboardPlus)
     public event EventHandler<string[]>? OnHistoryItemRemoved;
     public event EventHandler<ClipboardData>? OnHistoryItemPinUpdated;
 
+    public event EventHandler<bool>? OnHistoryEnabledChanged;
+
     private readonly SemaphoreSlim _historyItemLock = new(1, 1);
 
     private readonly List<string> _clipboardHistoryItemsIds = new();
@@ -181,7 +184,12 @@ private void Clipboard_HistoryChanged(object? sender, ClipboardHistoryChangedEve
         });
     }
 
-#endregion
+    private void Clipboard_HistoryEnabledChanged(object? sender, object e)
+    {
+        OnHistoryEnabledChanged?.Invoke(this, IsHistoryEnabled());
+    }
+
+    #endregion
 
     #region History Items
 

Diff for: src/Flow.Launcher.Plugin.ClipboardPlus/Main.cs

@@ -871,37 +871,35 @@ private void AddClipboardDataItem(ClipboardData clipboardData)
     public void RegisterEventsForWindowsClipboardHelper()
     {
         WindowsClipboardHelper.OnHistoryItemRemoved += WindowsClipboardHelper_OnHistoryItemRemoved;
+        WindowsClipboardHelper.OnHistoryEnabledChanged += WindowsClipboardHelper_OnHistoryEnabledChanged;
     }
 
     public void UnregisterEventsForWindowsClipboardHelper()
     {
         WindowsClipboardHelper.OnHistoryItemRemoved -= WindowsClipboardHelper_OnHistoryItemRemoved;
+        WindowsClipboardHelper.OnHistoryEnabledChanged -= WindowsClipboardHelper_OnHistoryEnabledChanged;
     }
 
-    private async void WindowsClipboardHelper_OnHistoryItemRemoved(object? sender, string[] e)
+    private void WindowsClipboardHelper_OnHistoryItemRemoved(object? sender, string[] e)
     {
-        await RecordsLock.WaitAsync();
-        try
+        _ = RemoveRecordsFromSystemAsync(r => e.Contains(r.HashId));
+    }
+
+    private void WindowsClipboardHelper_OnHistoryEnabledChanged(object? sender, bool e)
+    {
+        if (e)
         {
-            var recordsToRemove = RecordsList.Where(r => r.ClipboardData.FromWindowsClipboardHistory() && e.Contains(r.ClipboardData.HashId)).ToList();
-            while (recordsToRemove.Any())
-            {
-                var record = recordsToRemove.First();
-                RecordsList.Remove(record);
-                recordsToRemove.Remove(record);
-                record.Dispose();
-            }
+            _ = InitRecordsFromSystemAsync();
         }
-        finally
+        else
         {
-            RecordsLock.Release();
-            GarbageCollect();
+            _ = RemoveRecordsFromSystemAsync();
         }
     }
 
     #endregion
 
-    #region List & Database
+    #region List & Database & Windows History
 
     public async Task InitRecordsFromDatabaseAndSystemAsync()
     {
@@ -974,6 +972,35 @@ public async Task InitRecordsFromSystemAsync()
         RecordsLock.Release();
     }
 
+    private async Task RemoveRecordsFromSystemAsync(Func<ClipboardData, bool>? func = null)
+    {
+        await RecordsLock.WaitAsync();
+        try
+        {
+            List<ClipboardDataPair> recordsToRemove;
+            if (func == null)
+            {
+                recordsToRemove = RecordsList.Where(r => r.ClipboardData.FromWindowsClipboardHistory()).ToList();
+            }
+            else
+            {
+                recordsToRemove = RecordsList.Where(r => r.ClipboardData.FromWindowsClipboardHistory() && func(r.ClipboardData)).ToList();
+            }
+            while (recordsToRemove.Any())
+            {
+                var record = recordsToRemove.First();
+                RecordsList.Remove(record);
+                recordsToRemove.Remove(record);
+                record.Dispose();
+            }
+        }
+        finally
+        {
+            RecordsLock.Release();
+            GarbageCollect();
+        }
+    }
+
     private async Task<int> DeleteAllRecordsFromList()
     {
         await RecordsLock.WaitAsync();