From eaee359cb1d190b08f0c639fcf22a3202d1fd144 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Sat, 1 Jan 2022 01:36:47 +0300
Subject: [PATCH] Use GetHistoryItemsAsync

---
 ShareX.HistoryLib/Forms/HistoryForm.cs | 22 ++++++++++++----------
 ShareX.HistoryLib/HistoryManager.cs    |  6 ++++++
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ShareX.HistoryLib/Forms/HistoryForm.cs b/ShareX.HistoryLib/Forms/HistoryForm.cs
index e20e3268f..f3ae23bd9 100644
--- a/ShareX.HistoryLib/Forms/HistoryForm.cs
+++ b/ShareX.HistoryLib/Forms/HistoryForm.cs
@@ -30,6 +30,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace ShareX.HistoryLib
@@ -120,9 +121,10 @@ private void ResetFilters()
             cbHostFilterSelection.ResetText();
         }
 
-        private void RefreshHistoryItems(bool mockData = false)
+        private async Task RefreshHistoryItems(bool mockData = false)
         {
-            allHistoryItems = GetHistoryItems(mockData);
+            allHistoryItems = await GetHistoryItems(mockData);
+
             ApplyFilterSimple();
 
             cbTypeFilterSelection.Items.Clear();
@@ -143,7 +145,7 @@ private HistoryItem[] him_GetHistoryItems()
             return lvHistory.SelectedIndices.Cast<int>().Select(i => filteredHistoryItems[i]).ToArray();
         }
 
-        private HistoryItem[] GetHistoryItems(bool mockData = false)
+        private async Task<HistoryItem[]> GetHistoryItems(bool mockData = false)
         {
             HistoryManager history;
 
@@ -156,7 +158,7 @@ private HistoryItem[] GetHistoryItems(bool mockData = false)
                 history = new HistoryManagerJSON(HistoryPath);
             }
 
-            List<HistoryItem> historyItems = history.GetHistoryItems();
+            List<HistoryItem> historyItems = await history.GetHistoryItemsAsync();
             historyItems.Reverse();
             return historyItems.ToArray();
         }
@@ -380,11 +382,11 @@ private string OutputStats(HistoryItem[] historyItems)
 
         #region Form events
 
-        private void HistoryForm_Shown(object sender, EventArgs e)
+        private async void HistoryForm_Shown(object sender, EventArgs e)
         {
-            Refresh();
-            RefreshHistoryItems();
             this.ForceActivate();
+
+            await RefreshHistoryItems();
         }
 
         private void HistoryForm_Resize(object sender, EventArgs e)
@@ -401,17 +403,17 @@ private void HistoryForm_FormClosing(object sender, FormClosingEventArgs e)
             }
         }
 
-        private void HistoryForm_KeyDown(object sender, KeyEventArgs e)
+        private async void HistoryForm_KeyDown(object sender, KeyEventArgs e)
         {
             switch (e.KeyData)
             {
                 case Keys.F5:
-                    RefreshHistoryItems();
                     e.Handled = true;
+                    await RefreshHistoryItems();
                     break;
                 case Keys.Control | Keys.F5 when HelpersOptions.DevMode:
-                    RefreshHistoryItems(true);
                     e.Handled = true;
+                    await RefreshHistoryItems(true);
                     break;
             }
         }
diff --git a/ShareX.HistoryLib/HistoryManager.cs b/ShareX.HistoryLib/HistoryManager.cs
index d8e7e075c..59842a060 100644
--- a/ShareX.HistoryLib/HistoryManager.cs
+++ b/ShareX.HistoryLib/HistoryManager.cs
@@ -29,6 +29,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace ShareX.HistoryLib
@@ -62,6 +63,11 @@ public List<HistoryItem> GetHistoryItems()
             return new List<HistoryItem>();
         }
 
+        public async Task<List<HistoryItem>> GetHistoryItemsAsync()
+        {
+            return await Task.Run(() => GetHistoryItems());
+        }
+
         public bool AppendHistoryItem(HistoryItem historyItem)
         {
             return AppendHistoryItems(new HistoryItem[] { historyItem });