Replace async void with async task (#593)

* Replace async void with async task * #383 Co-authored-by: BornToBeRoot <BornToBeRoot@users.noreply.github.com>
BornToBeRoot · Mar 17, 2021 · dd1daee · dd1daee
1 parent 05926af
commit dd1daee
Show file tree

Hide file tree

Showing 44 changed files with 130 additions and 109 deletions.
diff --git a/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml.cs b/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml.cs
@@ -10,6 +10,7 @@
 using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Translators;
 using NETworkManager.Models;
+using System.Threading.Tasks;
 
 namespace NETworkManager.Controls
 {
@@ -177,7 +178,7 @@ private async void RemoteDesktop_SendCtrlAltDelAction(object view)
                 {
                     ConfigurationManager.Current.FixAirspace = true;
 
-                    await this.ShowMessageAsync(NETworkManager.Localization.Resources.Strings.Error, string.Format("{0}\n\nMessage:\n{1}", NETworkManager.Localization.Resources.Strings.CouldNotSendKeystroke, ex.Message, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog));
+                    await this.ShowMessageAsync(Localization.Resources.Strings.Error, string.Format("{0}\n\nMessage:\n{1}", NETworkManager.Localization.Resources.Strings.CouldNotSendKeystroke, ex.Message, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog));
 
                     ConfigurationManager.Current.FixAirspace = false;
                 }

diff --git a/Source/NETworkManager/Controls/PowerShellControl.xaml.cs b/Source/NETworkManager/Controls/PowerShellControl.xaml.cs
@@ -117,14 +117,14 @@ private void ReconnectAction()
         #endregion
 
         #region Methods       
-        private async void Connect()
+        private async Task Connect()
         {
             IsConnecting = true;
 
             var info = new ProcessStartInfo
             {
                 FileName = _sessionInfo.ApplicationFilePath,
-                Arguments = Models.PowerShell.PowerShell.BuildCommandLine(_sessionInfo)
+                Arguments = PowerShell.BuildCommandLine(_sessionInfo)
             };
 
             try

diff --git a/Source/NETworkManager/Controls/PuTTYControl.xaml.cs b/Source/NETworkManager/Controls/PuTTYControl.xaml.cs
@@ -119,7 +119,7 @@ private void ReconnectAction()
         #endregion
 
         #region Methods       
-        private async void Connect()
+        private async Task Connect()
         {
             IsConnecting = true;
 

diff --git a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
@@ -446,7 +446,7 @@ private void RdpGrid_SizeChanged(object sender, SizeChangedEventArgs e)
                 InitiateReconnection();
         }
 
-        private async void InitiateReconnection()
+        private async Task InitiateReconnection()
         {
             IsReconnecting = true;
 

diff --git a/Source/NETworkManager/Controls/TightVNCControl.xaml.cs b/Source/NETworkManager/Controls/TightVNCControl.xaml.cs
@@ -118,7 +118,7 @@ private void ReconnectAction()
         #endregion
 
         #region Methods       
-        private async void Connect()
+        private async Task Connect()
         {
             IsConnecting = true;
 

diff --git a/Source/NETworkManager/MainWindow.xaml.cs b/Source/NETworkManager/MainWindow.xaml.cs
@@ -28,6 +28,7 @@
 using NETworkManager.Models;
 using NETworkManager.Models.EventSystem;
 using System.Windows.Threading;
+using System.Threading.Tasks;
 
 namespace NETworkManager
 {
@@ -881,7 +882,7 @@ private void EventSystem_RedirectToSettingsEvent(object sender, EventArgs e)
             OpenSettings();
         }
 
-        private async void CloseSettings()
+        private async Task CloseSettings()
         {
             ShowSettingsView = false;
 
@@ -943,7 +944,7 @@ private void SettingsManager_PropertyChanged(object sender, PropertyChangedEvent
         #endregion
 
         #region Profiles
-        private async void LoadProfile(ProfileFileInfo info)
+        private async Task LoadProfile(ProfileFileInfo info)
         {            
             if (info.IsEncrypted && !info.IsPasswordValid)
             {
@@ -979,7 +980,7 @@ private async void LoadProfile(ProfileFileInfo info)
             }
         }
 
-        private async void SwitchProfile(ProfileFileInfo info)
+        private async Task SwitchProfile(ProfileFileInfo info)
         {
             try
             {

diff --git a/Source/NETworkManager/ProfileDialogManager.cs b/Source/NETworkManager/ProfileDialogManager.cs
@@ -2,14 +2,15 @@
 using NETworkManager.Profiles;
 using NETworkManager.ViewModels;
 using NETworkManager.Views;
+using System.Threading.Tasks;
 
 namespace NETworkManager
 {
     public static class ProfileDialogManager
     {
 
         #region Add profile, Edit profile, CopyAs profile, Delete profile, Edit group
-        public static async void ShowAddProfileDialog(IProfileManager viewModel, IDialogCoordinator dialogCoordinator)
+        public static async Task ShowAddProfileDialog(IProfileManager viewModel, IDialogCoordinator dialogCoordinator)
         {
             var customDialog = new CustomDialog
             {
@@ -38,7 +39,7 @@ public static async void ShowAddProfileDialog(IProfileManager viewModel, IDialog
             await dialogCoordinator.ShowMetroDialogAsync(viewModel, customDialog);
         }
 
-        public static async void ShowEditProfileDialog(IProfileManager viewModel, IDialogCoordinator dialogCoordinator, ProfileInfo selectedProfile)
+        public static async Task ShowEditProfileDialog(IProfileManager viewModel, IDialogCoordinator dialogCoordinator, ProfileInfo selectedProfile)
         {
             var customDialog = new CustomDialog
             {
@@ -68,7 +69,7 @@ public static async void ShowEditProfileDialog(IProfileManager viewModel, IDialo
             await dialogCoordinator.ShowMetroDialogAsync(viewModel, customDialog);
         }
 
-        public static async void ShowCopyAsProfileDialog(IProfileManager viewModel, IDialogCoordinator dialogCoordinator, ProfileInfo selectedProfile)
+        public static async Task ShowCopyAsProfileDialog(IProfileManager viewModel, IDialogCoordinator dialogCoordinator, ProfileInfo selectedProfile)
         {
             var customDialog = new CustomDialog
             {
@@ -96,7 +97,7 @@ public static async void ShowCopyAsProfileDialog(IProfileManager viewModel, IDia
             await dialogCoordinator.ShowMetroDialogAsync(viewModel, customDialog);
         }
 
-        public static async void ShowDeleteProfileDialog(IProfileManager viewModel, IDialogCoordinator dialogCoordinator, ProfileInfo selectedProfile)
+        public static async Task ShowDeleteProfileDialog(IProfileManager viewModel, IDialogCoordinator dialogCoordinator, ProfileInfo selectedProfile)
         {
             var customDialog = new CustomDialog
             {
@@ -124,7 +125,7 @@ public static async void ShowDeleteProfileDialog(IProfileManager viewModel, IDia
             await dialogCoordinator.ShowMetroDialogAsync(viewModel, customDialog);
         }
 
-        public static async void ShowEditGroupDialog(IProfileManager viewModel, IDialogCoordinator dialogCoordinator, string group)
+        public static async Task ShowEditGroupDialog(IProfileManager viewModel, IDialogCoordinator dialogCoordinator, string group)
         {
             var customDialog = new CustomDialog
             {

diff --git a/Source/NETworkManager/StatusWindow.xaml.cs b/Source/NETworkManager/StatusWindow.xaml.cs
@@ -151,7 +151,7 @@ private void OpenMainWindowAction()
         #endregion
 
         #region Methods
-        private async void Refresh(bool startTimer = false)
+        private async Task Refresh(bool startTimer = false)
         {
             IsRefreshing = true;
 

diff --git a/Source/NETworkManager/ViewModels/ARPTableViewModel.cs b/Source/NETworkManager/ViewModels/ARPTableViewModel.cs
@@ -214,7 +214,7 @@ public ARPTableViewModel(IDialogCoordinator instance)
             Run();
         }
 
-        private async void Run()
+        private async Task Run()
         {
             await Refresh();
 
@@ -236,7 +236,7 @@ private bool Refresh_CanExecute(object paramter)
             return Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
         }
 
-        private async void RefreshAction()
+        private async Task RefreshAction()
         {
             IsStatusMessageDisplayed = false;
 
@@ -250,7 +250,7 @@ private bool DeleteTable_CanExecute(object paramter)
             return Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
         }
 
-        private async void DeleteTableAction()
+        private async Task DeleteTableAction()
         {
             IsStatusMessageDisplayed = false;
 
@@ -275,7 +275,7 @@ private async void DeleteTableAction()
 
         private bool DeleteEntry_CanExecute(object paramter) => Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
 
-        private async void DeleteEntryAction()
+        private async Task DeleteEntryAction()
         {
             IsStatusMessageDisplayed = false;
 
@@ -300,7 +300,7 @@ private async void DeleteEntryAction()
 
         private bool AddEntry_CanExecute(object paramter) => Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
 
-        private async void AddEntryAction()
+        private async Task AddEntryAction()
         {
             IsStatusMessageDisplayed = false;
 
@@ -364,7 +364,7 @@ private void CopySelectedMulticastAction()
 
         public ICommand ExportCommand => new RelayCommand(p => ExportAction());
 
-        private async void ExportAction()
+        private async Task ExportAction()
         {
             var customDialog = new CustomDialog
             {

diff --git a/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs b/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs
@@ -214,7 +214,7 @@ public ConnectionsViewModel(IDialogCoordinator instance)
             Run();
         }
 
-        private async void Run()
+        private async Task Run()
         {
             await Refresh();
 
@@ -236,7 +236,7 @@ private bool Refresh_CanExecute(object paramter)
             return Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
         }
 
-        private async void RefreshAction()
+        private async Task RefreshAction()
         {
             IsStatusMessageDisplayed = false;
 
@@ -287,7 +287,7 @@ private void CopySelectedStateAction()
 
         public ICommand ExportCommand => new RelayCommand(p => ExportAction());
 
-        private async void ExportAction()
+        private async Task ExportAction()
         {
             var customDialog = new CustomDialog
             {

diff --git a/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs
@@ -9,6 +9,7 @@
 using NETworkManager.Models.Network;
 using NETworkManager.Views;
 using DnsClient;
+using System.Threading.Tasks;
 
 namespace NETworkManager.ViewModels
 {
@@ -270,8 +271,7 @@ private void DeleteDNSServerAction()
         #endregion
 
         #region Methods
-
-        public async void AddDNSServer()
+        public async Task AddDNSServer()
         {
             var customDialog = new CustomDialog
             {
@@ -296,7 +296,7 @@ public async void AddDNSServer()
             await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
 
-        public async void EditDNSServer()
+        public async Task EditDNSServer()
         {
             var customDialog = new CustomDialog
             {
@@ -322,7 +322,7 @@ public async void EditDNSServer()
             await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
 
-        public async void DeleteDNSServer()
+        public async Task DeleteDNSServer()
         {
             var customDialog = new CustomDialog
             {                

diff --git a/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
@@ -18,6 +18,7 @@
 using NETworkManager.Models.Export;
 using NETworkManager.Views;
 using DnsClient;
+using System.Threading.Tasks;
 
 namespace NETworkManager.ViewModels
 {
@@ -294,7 +295,7 @@ private void CopySelectedResultAction()
 
         public ICommand ExportCommand => new RelayCommand(p => ExportAction());
 
-        private async void ExportAction()
+        private async Task ExportAction()
         {
             var customDialog = new CustomDialog
             {

diff --git a/Source/NETworkManager/ViewModels/DiscoveryProtocolViewModel.cs b/Source/NETworkManager/ViewModels/DiscoveryProtocolViewModel.cs
@@ -284,7 +284,7 @@ public DiscoveryProtocolViewModel(IDialogCoordinator instance)
             _isLoading = false;
         }
 
-        private async void LoadNetworkInterfaces()
+        private async Task LoadNetworkInterfaces()
         {
             IsNetworkInterfaceLoading = true;
 
@@ -315,7 +315,7 @@ private void LoadSettings()
 
         private bool ReloadNetworkInterfaces_CanExecute(object obj) => !IsNetworkInterfaceLoading && Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
 
-        private async void ReloadNetworkInterfacesAction()
+        private async Task ReloadNetworkInterfacesAction()
         {
             IsNetworkInterfaceLoading = true;
 
@@ -336,7 +336,7 @@ private async void ReloadNetworkInterfacesAction()
 
         public ICommand OpenNetworkConnectionsCommand => new RelayCommand(p => OpenNetworkConnectionsAction());
 
-        public async void OpenNetworkConnectionsAction()
+        public async Task OpenNetworkConnectionsAction()
         {
             try
             {
@@ -350,7 +350,7 @@ public async void OpenNetworkConnectionsAction()
 
         public ICommand RestartAsAdminCommand => new RelayCommand(p => RestartAsAdminAction());
 
-        public async void RestartAsAdminAction()
+        public async Task RestartAsAdminAction()
         {
             try
             {
@@ -364,7 +364,7 @@ public async void RestartAsAdminAction()
 
         public ICommand CaptureCommand => new RelayCommand(p => CaptureAction());
 
-        public async void CaptureAction()
+        public async Task CaptureAction()
         {
             if (FirstRun)
                 FirstRun = false;

diff --git a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
@@ -26,6 +26,7 @@
 using NETworkManager.Localization.Translators;
 using NETworkManager.Models;
 using NETworkManager.Models.EventSystem;
+using System.Threading.Tasks;
 
 namespace NETworkManager.ViewModels
 {
@@ -325,7 +326,7 @@ private void CustomCommandAction(object guid)
 
         public ICommand AddProfileSelectedHostCommand => new RelayCommand(p => AddProfileSelectedHostAction());
 
-        private async void AddProfileSelectedHostAction()
+        private async Task AddProfileSelectedHostAction()
         {
             ProfileInfo profileInfo = new ProfileInfo()
             {
@@ -429,7 +430,7 @@ private void Scan()
                 StartScan();
         }
 
-        private async void StartScan()
+        private async Task StartScan()
         {
             IsStatusMessageDisplayed = false;
             IsScanRunning = true;
@@ -535,7 +536,7 @@ private void ScanFinished()
             IsScanRunning = false;
         }
 
-        private async void DetectIPRange()
+        private async Task DetectIPRange()
         {
             IsSubnetDetectionRunning = true;
 
@@ -573,7 +574,7 @@ private async void DetectIPRange()
             IsSubnetDetectionRunning = false;
         }
 
-        private async void CustomCommand(object guid)
+        private async Task CustomCommand(object guid)
         {
             if (guid is Guid id)
             {
@@ -619,7 +620,7 @@ private void AddHostToHistory(string ipRange)
             list.ForEach(x => SettingsManager.Current.IPScanner_HostsHistory.Add(x));
         }
 
-        private async void Export()
+        private async Task Export()
         {
             var customDialog = new CustomDialog
             {