Fix: Fixed an issue where ejecting drives would sometimes fail (#16124)

yaira2 · web-flow · commit d9c9bbb79aab · 2024-09-02T21:58:01.000-04:00
diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs
@@ -216,10 +216,9 @@ public FrameworkElement? ItemDecorator
 			}
 		}
 
-		private async void ItemDecorator_Click(object sender, RoutedEventArgs e)
+		private void ItemDecorator_Click(object sender, RoutedEventArgs e)
 		{
-			var result = await DriveHelpers.EjectDeviceAsync(Path);
-			await UIHelpers.ShowDeviceEjectResultAsync(Type, result);
+			DriveHelpers.EjectDeviceAsync(Path);
 		}
 
 		public static async Task<DriveItem> CreateFromPropertiesAsync(StorageFolder root, string deviceId, string label, DriveType type, IRandomAccessStream imageStream = null)
diff --git a/src/Files.App/Utils/Storage/Helpers/DriveHelpers.cs b/src/Files.App/Utils/Storage/Helpers/DriveHelpers.cs
@@ -13,10 +13,9 @@ namespace Files.App.Utils.Storage
 {
 	public static class DriveHelpers
 	{
-		public static Task<bool> EjectDeviceAsync(string path)
+		public static async void EjectDeviceAsync(string path)
 		{
-			var removableDevice = new RemovableDevice(path);
-			return removableDevice.EjectAsync();
+			await ContextMenu.InvokeVerb("eject", path);
 		}
 
 		public static string GetVolumeId(string driveName)
@@ -47,10 +46,7 @@ public static async Task<bool> CheckEmptyDrive(string? drivePath)
 				"InsertDiscDialog/OpenDriveButton".GetLocalizedResource(),
 				"Close".GetLocalizedResource());
 			if (ejectButton)
-			{
-				var result = await EjectDeviceAsync(matchingDrive.Path);
-				await UIHelpers.ShowDeviceEjectResultAsync(matchingDrive.Type, result);
-			}
+				EjectDeviceAsync(matchingDrive.Path);
 			return true;
 		}
 
diff --git a/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs
@@ -754,10 +754,7 @@ await DialogDisplayHelper.ShowDialogAsync("CommandNotExecutable".GetLocalizedRes
 						{
 							bool ejectButton = await DialogDisplayHelper.ShowDialogAsync("InsertDiscDialog/Title".GetLocalizedResource(), string.Format("InsertDiscDialog/Text".GetLocalizedResource(), matchingDrive.Path), "InsertDiscDialog/OpenDriveButton".GetLocalizedResource(), "Close".GetLocalizedResource());
 							if (ejectButton)
-							{
-								var result = await DriveHelpers.EjectDeviceAsync(matchingDrive.Path);
-								await UIHelpers.ShowDeviceEjectResultAsync(matchingDrive.Type, result);
-							}
+								DriveHelpers.EjectDeviceAsync(matchingDrive.Path);
 							return;
 						}
 						var pathToNavigate = resFolder.Result?.Path ?? normalizedInput;
@@ -958,7 +955,8 @@ public async Task SetAddressBarSuggestionsAsync(AutoSuggestBox sender, IShellPag
 					return true;
 				}))
 				{
-					SafetyExtensions.IgnoreExceptions(() => {
+					SafetyExtensions.IgnoreExceptions(() =>
+					{
 						NavigationBarSuggestions.Clear();
 						NavigationBarSuggestions.Add(new NavigationBarSuggestionItem()
 						{
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -260,7 +260,7 @@ public SidebarViewModel()
 			OpenInNewTabCommand = new AsyncRelayCommand(OpenInNewTabAsync);
 			OpenInNewWindowCommand = new AsyncRelayCommand(OpenInNewWindowAsync);
 			OpenInNewPaneCommand = new AsyncRelayCommand(OpenInNewPaneAsync);
-			EjectDeviceCommand = new AsyncRelayCommand(EjectDeviceAsync);
+			EjectDeviceCommand = new RelayCommand(EjectDevice);
 			FormatDriveCommand = new RelayCommand(FormatDrive);
 			OpenPropertiesCommand = new RelayCommand<CommandBarFlyout>(OpenProperties);
 			ReorderItemsCommand = new AsyncRelayCommand(ReorderItemsAsync);
@@ -953,10 +953,9 @@ private void OpenProperties(CommandBarFlyout menu)
 			menu.Closed += flyoutClosed;
 		}
 
-		private async Task EjectDeviceAsync()
+		private void EjectDevice()
 		{
-			var result = await DriveHelpers.EjectDeviceAsync(rightClickedItem.Path);
-			await UIHelpers.ShowDeviceEjectResultAsync(rightClickedItem is DriveItem driveItem ? driveItem.Type : Data.Items.DriveType.Unknown, result);
+			DriveHelpers.EjectDeviceAsync(rightClickedItem.Path);
 		}
 
 		private void FormatDrive()
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs
@@ -46,7 +46,7 @@ public DrivesWidgetViewModel()
 			PinToSidebarCommand = new AsyncRelayCommand<WidgetCardItem>(ExecutePinToSidebarCommand);
 			UnpinFromSidebarCommand = new AsyncRelayCommand<WidgetCardItem>(ExecuteUnpinFromSidebarCommand);
 			FormatDriveCommand = new RelayCommand<WidgetDriveCardItem>(ExecuteFormatDriveCommand);
-			EjectDeviceCommand = new AsyncRelayCommand<WidgetDriveCardItem>(ExecuteEjectDeviceCommand);
+			EjectDeviceCommand = new RelayCommand<WidgetDriveCardItem>(ExecuteEjectDeviceCommand);
 			OpenInNewPaneCommand = new AsyncRelayCommand<WidgetDriveCardItem>(ExecuteOpenInNewPaneCommand);
 			OpenPropertiesCommand = new RelayCommand<WidgetDriveCardItem>(ExecuteOpenPropertiesCommand);
 			DisconnectNetworkDriveCommand = new RelayCommand<WidgetDriveCardItem>(ExecuteDisconnectNetworkDriveCommand);
@@ -171,13 +171,12 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 
 		// Command methods
 
-		private async Task ExecuteEjectDeviceCommand(WidgetDriveCardItem? item)
+		private void ExecuteEjectDeviceCommand(WidgetDriveCardItem? item)
 		{
 			if (item is null)
 				return;
 
-			var result = await DriveHelpers.EjectDeviceAsync(item.Item.Path);
-			await UIHelpers.ShowDeviceEjectResultAsync(item.Item.Type, result);
+			DriveHelpers.EjectDeviceAsync(item.Item.Path);
 		}
 
 		private async Task ExecuteOpenInNewPaneCommand(WidgetDriveCardItem? item)
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs
@@ -61,7 +61,7 @@ public NetworkLocationsWidgetViewModel()
 			PinToSidebarCommand = new AsyncRelayCommand<WidgetCardItem>(ExecutePinToSidebarCommand);
 			UnpinFromSidebarCommand = new AsyncRelayCommand<WidgetCardItem>(ExecuteUnpinFromSidebarCommand);
 			FormatDriveCommand = new RelayCommand<WidgetDriveCardItem>(ExecuteFormatDriveCommand);
-			EjectDeviceCommand = new AsyncRelayCommand<WidgetDriveCardItem>(ExecuteEjectDeviceCommand);
+			EjectDeviceCommand = new RelayCommand<WidgetDriveCardItem>(ExecuteEjectDeviceCommand);
 			OpenInNewPaneCommand = new AsyncRelayCommand<WidgetDriveCardItem>(ExecuteOpenInNewPaneCommand);
 			OpenPropertiesCommand = new RelayCommand<WidgetDriveCardItem>(ExecuteOpenPropertiesCommand);
 			DisconnectNetworkDriveCommand = new RelayCommand<WidgetDriveCardItem>(ExecuteDisconnectNetworkDriveCommand);
@@ -203,13 +203,12 @@ public void DisableWidget()
 
 		// Command methods
 
-		private async Task ExecuteEjectDeviceCommand(WidgetDriveCardItem? item)
+		private void ExecuteEjectDeviceCommand(WidgetDriveCardItem? item)
 		{
 			if (item is null)
 				return;
 
-			var result = await DriveHelpers.EjectDeviceAsync(item.Item.Path);
-			await UIHelpers.ShowDeviceEjectResultAsync(item.Item.Type, result);
+			DriveHelpers.EjectDeviceAsync(item.Item.Path);
 		}
 
 		private async Task ExecuteOpenInNewPaneCommand(WidgetDriveCardItem? item)

Original file line number	Diff line number	Diff line change
`@@ -216,10 +216,9 @@ public FrameworkElement? ItemDecorator`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`
`219`		`- private async void ItemDecorator_Click(object sender, RoutedEventArgs e)`
	`219`	`+ private void ItemDecorator_Click(object sender, RoutedEventArgs e)`
`220`	`220`	`{`
`221`		`- var result = await DriveHelpers.EjectDeviceAsync(Path);`
`222`		`- await UIHelpers.ShowDeviceEjectResultAsync(Type, result);`
	`221`	`+ DriveHelpers.EjectDeviceAsync(Path);`
`223`	`222`	`}`
`224`	`223`
`225`	`224`	`public static async Task<DriveItem> CreateFromPropertiesAsync(StorageFolder root, string deviceId, string label, DriveType type, IRandomAccessStream imageStream = null)`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,9 @@ namespace Files.App.Utils.Storage`
`13`	`13`	`{`
`14`	`14`	`public static class DriveHelpers`
`15`	`15`	`{`
`16`		`- public static Task<bool> EjectDeviceAsync(string path)`
	`16`	`+ public static async void EjectDeviceAsync(string path)`
`17`	`17`	`{`
`18`		`- var removableDevice = new RemovableDevice(path);`
`19`		`- return removableDevice.EjectAsync();`
	`18`	`+ await ContextMenu.InvokeVerb("eject", path);`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`public static string GetVolumeId(string driveName)`
`@@ -47,10 +46,7 @@ public static async Task<bool> CheckEmptyDrive(string? drivePath)`
`47`	`46`	`"InsertDiscDialog/OpenDriveButton".GetLocalizedResource(),`
`48`	`47`	`"Close".GetLocalizedResource());`
`49`	`48`	`if (ejectButton)`
`50`		`- {`
`51`		`- var result = await EjectDeviceAsync(matchingDrive.Path);`
`52`		`- await UIHelpers.ShowDeviceEjectResultAsync(matchingDrive.Type, result);`
`53`		`- }`
	`49`	`+ EjectDeviceAsync(matchingDrive.Path);`
`54`	`50`	`return true;`
`55`	`51`	`}`
`56`	`52`
Original file line number	Diff line number	Diff line change
`@@ -754,10 +754,7 @@ await DialogDisplayHelper.ShowDialogAsync("CommandNotExecutable".GetLocalizedRes`
`754`	`754`	`{`
`755`	`755`	`bool ejectButton = await DialogDisplayHelper.ShowDialogAsync("InsertDiscDialog/Title".GetLocalizedResource(), string.Format("InsertDiscDialog/Text".GetLocalizedResource(), matchingDrive.Path), "InsertDiscDialog/OpenDriveButton".GetLocalizedResource(), "Close".GetLocalizedResource());`
`756`	`756`	`if (ejectButton)`
`757`		`- {`
`758`		`- var result = await DriveHelpers.EjectDeviceAsync(matchingDrive.Path);`
`759`		`- await UIHelpers.ShowDeviceEjectResultAsync(matchingDrive.Type, result);`
`760`		`- }`
	`757`	`+ DriveHelpers.EjectDeviceAsync(matchingDrive.Path);`
`761`	`758`	`return;`
`762`	`759`	`}`
`763`	`760`	`var pathToNavigate = resFolder.Result?.Path ?? normalizedInput;`
`@@ -958,7 +955,8 @@ public async Task SetAddressBarSuggestionsAsync(AutoSuggestBox sender, IShellPag`
`958`	`955`	`return true;`
`959`	`956`	`}))`
`960`	`957`	`{`
`961`		`- SafetyExtensions.IgnoreExceptions(() => {`
	`958`	`+ SafetyExtensions.IgnoreExceptions(() =>`
	`959`	`+ {`
`962`	`960`	`NavigationBarSuggestions.Clear();`
`963`	`961`	`NavigationBarSuggestions.Add(new NavigationBarSuggestionItem()`
`964`	`962`	`{`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ public SidebarViewModel()`
`260`	`260`	`OpenInNewTabCommand = new AsyncRelayCommand(OpenInNewTabAsync);`
`261`	`261`	`OpenInNewWindowCommand = new AsyncRelayCommand(OpenInNewWindowAsync);`
`262`	`262`	`OpenInNewPaneCommand = new AsyncRelayCommand(OpenInNewPaneAsync);`
`263`		`- EjectDeviceCommand = new AsyncRelayCommand(EjectDeviceAsync);`
	`263`	`+ EjectDeviceCommand = new RelayCommand(EjectDevice);`
`264`	`264`	`FormatDriveCommand = new RelayCommand(FormatDrive);`
`265`	`265`	`OpenPropertiesCommand = new RelayCommand<CommandBarFlyout>(OpenProperties);`
`266`	`266`	`ReorderItemsCommand = new AsyncRelayCommand(ReorderItemsAsync);`
`@@ -953,10 +953,9 @@ private void OpenProperties(CommandBarFlyout menu)`
`953`	`953`	`menu.Closed += flyoutClosed;`
`954`	`954`	`}`
`955`	`955`
`956`		`- private async Task EjectDeviceAsync()`
	`956`	`+ private void EjectDevice()`
`957`	`957`	`{`
`958`		`- var result = await DriveHelpers.EjectDeviceAsync(rightClickedItem.Path);`
`959`		`- await UIHelpers.ShowDeviceEjectResultAsync(rightClickedItem is DriveItem driveItem ? driveItem.Type : Data.Items.DriveType.Unknown, result);`
	`958`	`+ DriveHelpers.EjectDeviceAsync(rightClickedItem.Path);`
`960`	`959`	`}`
`961`	`960`
`962`	`961`	`private void FormatDrive()`