Code Quality: Remove Async suffix from event methods (#13567)

Author: A-Loot

src/Files.App/App.xaml.cs

@@ -264,7 +264,7 @@ private void EnsureSuperEarlyWindow()
 
 			// Hook events for the window
 			window.Activated += Window_Activated;
-			window.Closed += Window_ClosedAsync;
+			window.Closed += Window_Closed;
 
 			// Attempt to activate it
 			window.Activate();
@@ -294,7 +294,7 @@ public void OnActivated(AppActivationArguments activatedEventArgs)
 		/// </summary>
 		/// <param name="sender">The source of the suspend request.</param>
 		/// <param name="args">Details about the suspend request.</param>
-		private async void Window_ClosedAsync(object sender, WindowEventArgs args)
+		private async void Window_Closed(object sender, WindowEventArgs args)
 		{
 			// Save application state and stop any background activity
 

src/Files.App/Data/Items/DriveItem.cs

@@ -214,12 +214,12 @@ public FrameworkElement? ItemDecorator
 						Width = 16
 					}
 				};
-				itemDecorator.Click += ItemDecorator_ClickAsync;
+				itemDecorator.Click += ItemDecorator_Click;
 				return itemDecorator;
 			}
 		}
 
-		private async void ItemDecorator_ClickAsync(object sender, RoutedEventArgs e)
+		private async void ItemDecorator_Click(object sender, RoutedEventArgs e)
 		{
 			var result = await DriveHelpers.EjectDeviceAsync(Path);
 			await UIHelpers.ShowDeviceEjectResultAsync(Type, result);

src/Files.App/Data/Models/DrivesViewModel.cs

@@ -40,17 +40,17 @@ public DrivesViewModel(IRemovableDrivesService removableDrivesService, ISizeProv
 			watcher = removableDrivesService.CreateWatcher();
 			watcher.DeviceAdded += Watcher_DeviceAdded;
 			watcher.DeviceRemoved += Watcher_DeviceRemoved;
-			watcher.DeviceModified += Watcher_DeviceModifiedAsync;
-			watcher.EnumerationCompleted += Watcher_EnumerationCompletedAsync;
+			watcher.DeviceModified += Watcher_DeviceModified;
+			watcher.EnumerationCompleted += Watcher_EnumerationCompleted;
 		}
 
-		private async void Watcher_EnumerationCompletedAsync(object? sender, System.EventArgs e)
+		private async void Watcher_EnumerationCompleted(object? sender, System.EventArgs e)
 		{
 			logger.LogDebug("Watcher_EnumerationCompleted");
 			await folderSizeProvider.CleanAsync();
 		}
 
-		private async void Watcher_DeviceModifiedAsync(object? sender, string e)
+		private async void Watcher_DeviceModified(object? sender, string e)
 		{
 			var matchingDriveEjected = Drives.FirstOrDefault(x => Path.GetFullPath(x.Path) == Path.GetFullPath(e));
 			if (matchingDriveEjected != null)
@@ -68,7 +68,7 @@ private void Watcher_DeviceRemoved(object? sender, string e)
 			}
 
 			// Update the collection on the ui-thread.
-			Watcher_EnumerationCompletedAsync(null, EventArgs.Empty);
+			Watcher_EnumerationCompleted(null, EventArgs.Empty);
 		}
 
 		private void Watcher_DeviceAdded(object? sender, ILocatableFolder e)
@@ -90,7 +90,7 @@ private void Watcher_DeviceAdded(object? sender, ILocatableFolder e)
 				Drives.Add(e);
 			}
 
-			Watcher_EnumerationCompletedAsync(null, EventArgs.Empty);
+			Watcher_EnumerationCompleted(null, EventArgs.Empty);
 		}
 
 		public async Task UpdateDrivesAsync()
@@ -116,8 +116,8 @@ public void Dispose()
 			watcher.Stop();
 			watcher.DeviceAdded -= Watcher_DeviceAdded;
 			watcher.DeviceRemoved -= Watcher_DeviceRemoved;
-			watcher.DeviceModified -= Watcher_DeviceModifiedAsync;
-			watcher.EnumerationCompleted -= Watcher_EnumerationCompletedAsync;
+			watcher.DeviceModified -= Watcher_DeviceModified;
+			watcher.EnumerationCompleted -= Watcher_EnumerationCompleted;
 		}
 	}
 }

src/Files.App/Data/Models/ItemViewModel.cs

@@ -431,10 +431,10 @@ public ItemViewModel(FolderSettingsViewModel folderSettingsViewModel)
 			enumFolderSemaphore = new SemaphoreSlim(1, 1);
 			dispatcherQueue = DispatcherQueue.GetForCurrentThread();
 
-			UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEventAsync;
-			fileTagsSettingsService.OnSettingImportedEvent += FileTagsSettingsService_OnSettingUpdatedAsync;
-			fileTagsSettingsService.OnTagsUpdated += FileTagsSettingsService_OnSettingUpdatedAsync;
-			folderSizeProvider.SizeChanged += FolderSizeProvider_SizeChangedAsync;
+			UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
+			fileTagsSettingsService.OnSettingImportedEvent += FileTagsSettingsService_OnSettingUpdated;
+			fileTagsSettingsService.OnTagsUpdated += FileTagsSettingsService_OnSettingUpdated;
+			folderSizeProvider.SizeChanged += FolderSizeProvider_SizeChanged;
 			RecycleBinManager.Default.RecycleBinItemCreated += RecycleBinItemCreatedAsync;
 			RecycleBinManager.Default.RecycleBinItemDeleted += RecycleBinItemDeletedAsync;
 			RecycleBinManager.Default.RecycleBinRefreshRequested += RecycleBinRefreshRequestedAsync;
@@ -482,7 +482,7 @@ private async void RecycleBinItemCreatedAsync(object sender, FileSystemEventArgs
 			await ApplySingleFileChangeAsync(newListedItem);
 		}
 
-		private async void FolderSizeProvider_SizeChangedAsync(object? sender, SizeChangedEventArgs e)
+		private async void FolderSizeProvider_SizeChanged(object? sender, SizeChangedEventArgs e)
 		{
 			try
 			{
@@ -522,7 +522,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 			}
 		}
 
-		private async void FileTagsSettingsService_OnSettingUpdatedAsync(object? sender, EventArgs e)
+		private async void FileTagsSettingsService_OnSettingUpdated(object? sender, EventArgs e)
 		{
 			await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 			{
@@ -531,7 +531,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 			});
 		}
 
-		private async void UserSettingsService_OnSettingChangedEventAsync(object? sender, SettingChangedEventArgs e)
+		private async void UserSettingsService_OnSettingChangedEvent(object? sender, SettingChangedEventArgs e)
 		{
 			switch (e.SettingName)
 			{
@@ -1792,14 +1792,14 @@ await Task.Factory.StartNew(() =>
 				if (rootFolder.AreQueryOptionsSupported(options))
 				{
 					var itemQueryResult = rootFolder.CreateItemQueryWithOptions(options).ToStorageItemQueryResult();
-					itemQueryResult.ContentsChanged += ItemQueryResult_ContentsChangedAsync;
+					itemQueryResult.ContentsChanged += ItemQueryResult_ContentsChanged;
 
 					// Just get one item to start getting notifications
 					var watchedItemsOperation = itemQueryResult.GetItemsAsync(0, 1);
 
 					watcherCTS.Token.Register(() =>
 					{
-						itemQueryResult.ContentsChanged -= ItemQueryResult_ContentsChangedAsync;
+						itemQueryResult.ContentsChanged -= ItemQueryResult_ContentsChanged;
 						watchedItemsOperation?.Cancel();
 					});
 				}
@@ -1820,14 +1820,14 @@ private void WatchForWin32FolderChanges(string? folderPath)
 					NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.FileName | NotifyFilters.DirectoryName
 				};
 
-				watcher.Created += DirectoryWatcher_ChangedAsync;
-				watcher.Deleted += DirectoryWatcher_ChangedAsync;
-				watcher.Renamed += DirectoryWatcher_ChangedAsync;
+				watcher.Created += DirectoryWatcher_Changed;
+				watcher.Deleted += DirectoryWatcher_Changed;
+				watcher.Renamed += DirectoryWatcher_Changed;
 				watcher.EnableRaisingEvents = true;
 			}
 		}
 
-		private async void DirectoryWatcher_ChangedAsync(object sender, FileSystemEventArgs e)
+		private async void DirectoryWatcher_Changed(object sender, FileSystemEventArgs e)
 		{
 			Debug.WriteLine($"Directory watcher event: {e.ChangeType}, {e.FullPath}");
 
@@ -1837,7 +1837,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 			});
 		}
 
-		private async void ItemQueryResult_ContentsChangedAsync(IStorageQueryResultBase sender, object args)
+		private async void ItemQueryResult_ContentsChanged(IStorageQueryResultBase sender, object args)
 		{
 			// Query options have to be reapplied otherwise old results are returned
 			var options = new QueryOptions()
@@ -2461,10 +2461,10 @@ public void Dispose()
 			RecycleBinManager.Default.RecycleBinItemCreated -= RecycleBinItemCreatedAsync;
 			RecycleBinManager.Default.RecycleBinItemDeleted -= RecycleBinItemDeletedAsync;
 			RecycleBinManager.Default.RecycleBinRefreshRequested -= RecycleBinRefreshRequestedAsync;
-			UserSettingsService.OnSettingChangedEvent -= UserSettingsService_OnSettingChangedEventAsync;
-			fileTagsSettingsService.OnSettingImportedEvent -= FileTagsSettingsService_OnSettingUpdatedAsync;
-			fileTagsSettingsService.OnTagsUpdated -= FileTagsSettingsService_OnSettingUpdatedAsync;
-			folderSizeProvider.SizeChanged -= FolderSizeProvider_SizeChangedAsync;
+			UserSettingsService.OnSettingChangedEvent -= UserSettingsService_OnSettingChangedEvent;
+			fileTagsSettingsService.OnSettingImportedEvent -= FileTagsSettingsService_OnSettingUpdated;
+			fileTagsSettingsService.OnTagsUpdated -= FileTagsSettingsService_OnSettingUpdated;
+			folderSizeProvider.SizeChanged -= FolderSizeProvider_SizeChanged;
 			DefaultIcons.Clear();
 		}
 	}

src/Files.App/Dialogs/AddItemDialog.xaml

@@ -13,7 +13,7 @@
 	Grid.RowSpan="4"
 	BorderThickness="0"
 	CornerRadius="{StaticResource OverlayCornerRadius}"
-	Loaded="AddItemDialog_LoadedAsync"
+	Loaded="AddItemDialog_Loaded"
 	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
 	SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
 	Style="{StaticResource DefaultContentDialogStyle}"

src/Files.App/Dialogs/AddItemDialog.xaml.cs

@@ -35,7 +35,7 @@ private void ListView_ItemClick(object sender, ItemClickEventArgs e)
 			Hide();
 		}
 
-		private async void AddItemDialog_LoadedAsync(object sender, RoutedEventArgs e)
+		private async void AddItemDialog_Loaded(object sender, RoutedEventArgs e)
 		{
 			var itemTypes = addItemService.GetEntries();
 			await ViewModel.AddItemsToListAsync(itemTypes);

src/Files.App/Helpers/ShareItemHelpers.cs

@@ -25,11 +25,11 @@ public static void ShareItems(IEnumerable<ListedItem> itemsToShare)
 			IntPtr result = interop.GetForWindow(MainWindow.Instance.WindowHandle, InteropHelpers.DataTransferManagerInteropIID);
 
 			var manager = WinRT.MarshalInterface<DataTransferManager>.FromAbi(result);
-			manager.DataRequested += new TypedEventHandler<DataTransferManager, DataRequestedEventArgs>(Manager_DataRequestedAsync);
+			manager.DataRequested += new TypedEventHandler<DataTransferManager, DataRequestedEventArgs>(Manager_DataRequested);
 
 			interop.ShowShareUIForWindow(MainWindow.Instance.WindowHandle);
 
-			async void Manager_DataRequestedAsync(DataTransferManager sender, DataRequestedEventArgs args)
+			async void Manager_DataRequested(DataTransferManager sender, DataRequestedEventArgs args)
 			{
 				DataRequestDeferral dataRequestDeferral = args.Request.GetDeferral();
 				List<IStorageItem> items = new();

src/Files.App/Helpers/UI/ThemeHelper.cs

@@ -62,7 +62,7 @@ public static bool Initialize()
 
 			// Registering to color changes, thus we notice when user changes theme system wide
 			UiSettings = new UISettings();
-			UiSettings.ColorValuesChanged += UiSettings_ColorValuesChangedAsync;
+			UiSettings.ColorValuesChanged += UiSettings_ColorValuesChanged;
 
 			return true;
 		}
@@ -77,7 +77,7 @@ public static void ApplyResources()
 			ApplyTheme();
 		}
 
-		private static async void UiSettings_ColorValuesChangedAsync(UISettings sender, object args)
+		private static async void UiSettings_ColorValuesChanged(UISettings sender, object args)
 		{
 			// Make sure we have a reference to our window so we dispatch a UI change
 			if (currentApplicationWindow is null)

src/Files.App/Services/UserSizeProvider.cs

@@ -19,7 +19,7 @@ public UserSizeProvider()
 			provider = GetProvider();
 			provider.SizeChanged += Provider_SizeChanged;
 
-			folderPreferences.PropertyChanged += FolderPreferences_PropertyChangedAsync;
+			folderPreferences.PropertyChanged += FolderPreferences_PropertyChanged;
 		}
 
 		public Task CleanAsync()
@@ -37,13 +37,13 @@ public bool TryGetSize(string path, out ulong size)
 		public void Dispose()
 		{
 			provider.Dispose();
-			folderPreferences.PropertyChanged -= FolderPreferences_PropertyChangedAsync;
+			folderPreferences.PropertyChanged -= FolderPreferences_PropertyChanged;
 		}
 
 		private ISizeProvider GetProvider()
 			=> folderPreferences.CalculateFolderSizes ? new DrivesSizeProvider() : new NoSizeProvider();
 
-		private async void FolderPreferences_PropertyChangedAsync(object sender, PropertyChangedEventArgs e)
+		private async void FolderPreferences_PropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
 			if (e.PropertyName is nameof(IFoldersSettingsService.CalculateFolderSizes))
 			{

src/Files.App/UserControls/FilePreviews/HtmlPreview.xaml

@@ -20,7 +20,7 @@
 			x:Name="WebViewControl"
 			HorizontalAlignment="Stretch"
 			VerticalAlignment="Stretch"
-			Loaded="WebViewControl_LoadedAsync" />
+			Loaded="WebViewControl_Loaded" />
 
 	</Border>
 </UserControl>