Merge pull request #689 from skadefro/master

cleanup unused asyncs
open-rpa · Aug 22, 2022 · aec0015 · aec0015
2 parents f36e4e9 + 1bb38b6
commit aec0015
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/OpenRPA.Image/ImageElement.cs b/OpenRPA.Image/ImageElement.cs
@@ -95,7 +95,7 @@ public Task Highlight(bool Blocking, System.Drawing.Color Color, TimeSpan Durati
         public static extern IntPtr GetDC(IntPtr hwnd);
         [DllImport("User32.dll")]
         public static extern void ReleaseDC(IntPtr hwnd, IntPtr dc);
-        public async Task _Highlight(System.Drawing.Color Color, TimeSpan Duration)
+        public Task _Highlight(System.Drawing.Color Color, TimeSpan Duration)
         {
             System.Threading.Thread.CurrentThread.Name = "UIHighlighter";
             using (Interfaces.Overlay.OverlayWindow _overlayWindow = new Interfaces.Overlay.OverlayWindow(true))
@@ -112,7 +112,7 @@ public async Task _Highlight(System.Drawing.Color Color, TimeSpan Duration)
                     _overlayWindow.TopMost = true;
                 } while (_overlayWindow.Visible && sw.Elapsed < Duration);
                 _overlayWindow.Close();
-                return;
+                return Task.CompletedTask;
             }
             //var r = new Rectangle(Rectangle.Location, Rectangle.Size);
             //IntPtr desktopPtr = GetDC(IntPtr.Zero);

diff --git a/OpenRPA.Interfaces/UIElement.cs b/OpenRPA.Interfaces/UIElement.cs
@@ -283,7 +283,7 @@ public Task Highlight(bool Blocking, System.Drawing.Color Color, TimeSpan Durati
         [DllImport("User32.dll")]
         public static extern void ReleaseDC(IntPtr hwnd, IntPtr dc);
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "IDE1006")]
-        public async Task _Highlight(System.Drawing.Color Color, TimeSpan Duration)
+        public Task _Highlight(System.Drawing.Color Color, TimeSpan Duration)
         {
             System.Threading.Thread.CurrentThread.Name = "UIHighlighter";
             using (Interfaces.Overlay.OverlayWindow _overlayWindow = new Interfaces.Overlay.OverlayWindow(true))
@@ -299,7 +299,7 @@ public async Task _Highlight(System.Drawing.Color Color, TimeSpan Duration)
                     System.Threading.Thread.Sleep(10);
                     _overlayWindow.TopMost = true;
                 } while (_overlayWindow.Visible && sw.Elapsed < Duration);
-                return;
+                return Task.CompletedTask;
             }
             //var r = new Rectangle(Rectangle.Location, Rectangle.Size);
             //IntPtr desktopPtr = GetDC(IntPtr.Zero);

diff --git a/OpenRPA.WorkItems/RobotInstance.cs b/OpenRPA.WorkItems/RobotInstance.cs
@@ -320,7 +320,7 @@ await global.webSocketClient.Watch("openrpa",
             }
             Log.FunctionOutdent("RobotInstance", "RobotInstance_WebSocketClient_OnOpen");
         }
-        private async void WebSocketClient_OnClose(string reason)
+        private void WebSocketClient_OnClose(string reason)
         {
             try
             {
@@ -342,10 +342,10 @@ private async void WebSocketClient_OnClose(string reason)
             _ = Connect();
             Log.FunctionOutdent("RobotInstance", "WebSocketClient_OnClose");
         }
-        protected internal async void WebSocketClient_OnQueueClosed(IQueueClosedMessage message, QueueMessageEventArgs e)
+        protected internal void WebSocketClient_OnQueueClosed(IQueueClosedMessage message, QueueMessageEventArgs e)
         {
         }
-        private async void WebSocketClient_OnQueueMessage(IQueueMessage message, QueueMessageEventArgs e)
+        private void WebSocketClient_OnQueueMessage(IQueueMessage message, QueueMessageEventArgs e)
         {
             Log.FunctionIndent("RobotInstance", "WebSocketClient_OnQueueMessage");
             Log.FunctionOutdent("RobotInstance", "WebSocketClient_OnQueueMessage");
@@ -481,7 +481,7 @@ public async Task LoadServerData()
                 Log.Debug("LoadServerData::end");
             }
         }
-        private async void onWatchEvent(string id, Newtonsoft.Json.Linq.JObject data)
+        private void onWatchEvent(string id, Newtonsoft.Json.Linq.JObject data)
         {
             try
             {

diff --git a/OpenRPA.WorkItems/WorkitemQueue.cs b/OpenRPA.WorkItems/WorkitemQueue.cs
@@ -115,16 +115,17 @@ public async Task Save(bool skipOnline = false)
                 });
             }
         }
-        public async Task Update(IWorkitemQueue item, bool skipOnline = false)
+        public Task Update(IWorkitemQueue item, bool skipOnline = false)
         {
             GenericTools.RunUI(() =>
             {
                 RobotInstance.instance.WorkItemQueues.UpdateItem(this, item);
             });
             isDirty = false;
+            return Task.CompletedTask;
             // await Save<WorkitemQueue>(skipOnline);
         }
-        public async Task Delete(bool skipOnline = false)
+        public  Task Delete(bool skipOnline = false)
         {
             if (System.Threading.Monitor.TryEnter(RobotInstance.instance.WorkItemQueues, 1000))
             {
@@ -137,6 +138,7 @@ public async Task Delete(bool skipOnline = false)
                     System.Threading.Monitor.Exit(RobotInstance.instance.WorkItemQueues);
                 }
             }
+            return Task.CompletedTask;
         }
         public void ExportFile(string filepath)
         {

diff --git a/OpenRPA/OpenRPA.csproj b/OpenRPA/OpenRPA.csproj
@@ -11,7 +11,7 @@
 		<Description>Base UI of OpenRPA, used as part of OpenRPA robot</Description>
 		<PackageLicenseExpression>MPL-2.0</PackageLicenseExpression>
 		<PackageProjectUrl>https://github.com/open-rpa/openrpa</PackageProjectUrl>
-		<Version>1.4.38</Version>
+		<Version>1.4.39</Version>
 		<PackageReleaseNotes></PackageReleaseNotes>
 		<PackageIcon>openrpa.png</PackageIcon>
 		<Configurations>Debug;Release;ReleaseNuget;PrepInstaller</Configurations>

diff --git a/OpenRPA/WorkflowTrackingParticipant.cs b/OpenRPA/WorkflowTrackingParticipant.cs
@@ -277,9 +277,6 @@ protected override void Track(TrackingRecord trackRecord, TimeSpan timeStamp)
                                                     var s =  ms / 1000;
                                                     RobotInstance.meter_activities?.Record(s, _tags);
                                                     span?.Dispose();
-                                                } else
-                                                {
-                                                    var b = true;
                                                 }
                                             }
                                         }