Feature: Added option to confirm permanent deletion only (#11212)

hishitetsu · web-flow · commit 1280b061a355 · 2023-02-08T12:09:22.000-05:00
diff --git a/src/Files.App/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs b/src/Files.App/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs
@@ -116,7 +116,7 @@ await DialogDisplayHelper.ShowDialogAsync(
 
 		#region Delete
 
-		public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPath> source, bool showDialog, bool permanently, bool registerHistory)
+		public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPath> source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory)
 		{
 			source = await source.ToListAsync();
 
@@ -125,7 +125,8 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
 			var deleteFromRecycleBin = source.Select(item => item.Path).Any(path => RecycleBinHelpers.IsPathUnderRecycleBin(path));
 			var canBeSentToBin = !deleteFromRecycleBin && await RecycleBinHelpers.HasRecycleBin(source.FirstOrDefault()?.Path);
 
-			if (showDialog)
+			if (showDialog is DeleteConfirmationPolicies.Always
+				|| showDialog is DeleteConfirmationPolicies.PermanentOnly && (permanently || !canBeSentToBin))
 			{
 				var incomingItems = new List<BaseFileSystemDialogItemViewModel>();
 				List<ShellFileItem>? binItems = null;
@@ -193,13 +194,13 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
 			return returnStatus;
 		}
 
-		public Task<ReturnResult> DeleteItemAsync(IStorageItemWithPath source, bool showDialog, bool permanently, bool registerHistory)
+		public Task<ReturnResult> DeleteItemAsync(IStorageItemWithPath source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory)
 			=> DeleteItemsAsync(source.CreateEnumerable(), showDialog, permanently, registerHistory);
 
-		public Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItem> source, bool showDialog, bool permanently, bool registerHistory)
+		public Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItem> source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory)
 			=> DeleteItemsAsync(source.Select((item) => item.FromStorageItem()), showDialog, permanently, registerHistory);
 
-		public Task<ReturnResult> DeleteItemAsync(IStorageItem source, bool showDialog, bool permanently, bool registerHistory)
+		public Task<ReturnResult> DeleteItemAsync(IStorageItem source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory)
 			=> DeleteItemAsync(source.FromStorageItem(), showDialog, permanently, registerHistory);
 
 		#endregion Delete
@@ -258,7 +259,7 @@ public async Task<ReturnResult> PerformOperationTypeAsync(DataPackageOperation o
 				}
 				if (destination.StartsWith(CommonPaths.RecycleBinPath, StringComparison.Ordinal))
 				{
-					return await RecycleItemsFromClipboard(packageView, destination, UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog, registerHistory);
+					return await RecycleItemsFromClipboard(packageView, destination, UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy, registerHistory);
 				}
 				else if (operation.HasFlag(DataPackageOperation.Copy))
 				{
@@ -625,7 +626,7 @@ public async Task<ReturnResult> CreateShortcutFromClipboard(DataPackageView pack
 			return returnStatus;
 		}
 
-		public async Task<ReturnResult> RecycleItemsFromClipboard(DataPackageView packageView, string destination, bool showDialog, bool registerHistory)
+		public async Task<ReturnResult> RecycleItemsFromClipboard(DataPackageView packageView, string destination, DeleteConfirmationPolicies showDialog, bool registerHistory)
 		{
 			if (!HasDraggedStorageItems(packageView))
 			{
diff --git a/src/Files.App/Filesystem/FilesystemOperations/Helpers/IFilesystemHelpers.cs b/src/Files.App/Filesystem/FilesystemOperations/Helpers/IFilesystemHelpers.cs
@@ -28,7 +28,7 @@ public interface IFilesystemHelpers : IDisposable
 		/// <param name="permanently">Determines whether <paramref name="source"/> is be deleted permanently</param>
 		/// <param name="registerHistory">Determines whether <see cref="IStorageHistory"/> is saved</param>
 		/// <returns><see cref="ReturnResult"/> of performed operation</returns>
-		Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItem> source, bool showDialog, bool permanently, bool registerHistory);
+		Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItem> source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory);
 
 		/// <summary>
 		/// Deletes provided <paramref name="source"/>
@@ -38,7 +38,7 @@ public interface IFilesystemHelpers : IDisposable
 		/// <param name="permanently">Determines whether <paramref name="source"/> is be deleted permanently</param>
 		/// <param name="registerHistory">Determines whether <see cref="IStorageHistory"/> is saved</param>
 		/// <returns><see cref="ReturnResult"/> of performed operation</returns>
-		Task<ReturnResult> DeleteItemAsync(IStorageItem source, bool showDialog, bool permanently, bool registerHistory);
+		Task<ReturnResult> DeleteItemAsync(IStorageItem source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory);
 
 		/// <summary>
 		/// Deletes provided <paramref name="source"/>
@@ -48,7 +48,7 @@ public interface IFilesystemHelpers : IDisposable
 		/// <param name="permanently">Determines whether <paramref name="source"/> is be deleted permanently</param>
 		/// <param name="registerHistory">Determines whether <see cref="IStorageHistory"/> is saved</param>
 		/// <returns><see cref="ReturnResult"/> of performed operation</returns>
-		Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPath> source, bool showDialog, bool permanently, bool registerHistory);
+		Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPath> source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory);
 
 		/// <summary>
 		/// Deletes provided <paramref name="source"/>
@@ -58,7 +58,7 @@ public interface IFilesystemHelpers : IDisposable
 		/// <param name="permanently">Determines whether <paramref name="source"/> is be deleted permanently</param>
 		/// <param name="registerHistory">Determines whether <see cref="IStorageHistory"/> is saved</param>
 		/// <returns><see cref="ReturnResult"/> of performed operation</returns>
-		Task<ReturnResult> DeleteItemAsync(IStorageItemWithPath source, bool showDialog, bool permanently, bool registerHistory);
+		Task<ReturnResult> DeleteItemAsync(IStorageItemWithPath source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory);
 
 		#endregion Delete
 
@@ -175,7 +175,7 @@ public interface IFilesystemHelpers : IDisposable
 		/// <returns><see cref="ReturnResult"/> of performed operation</returns>
 		Task<ReturnResult> CopyItemsFromClipboard(DataPackageView packageView, string destination, bool showDialog, bool registerHistory);
 
-		Task<ReturnResult> RecycleItemsFromClipboard(DataPackageView packageView, string destination, bool showDialog, bool registerHistory);
+		Task<ReturnResult> RecycleItemsFromClipboard(DataPackageView packageView, string destination, DeleteConfirmationPolicies showDialog, bool registerHistory);
 
 		Task<ReturnResult> CreateShortcutFromClipboard(DataPackageView packageView, string destination, bool showDialog, bool registerHistory);
 
diff --git a/src/Files.App/Filesystem/StorageHistory/StorageHistoryOperations.cs b/src/Files.App/Filesystem/StorageHistory/StorageHistoryOperations.cs
@@ -38,13 +38,15 @@ public async Task<ReturnResult> Undo(IStorageHistory history)
 				case FileOperationType.CreateNew: // Opposite: Delete created items
 					if (!IsHistoryNull(history.Source))
 					{
-						return await helpers.DeleteItemsAsync(history.Source, true, true, false); // Show a dialog to prevent unexpected deletion
+						// Show a dialog regardless of the setting to prevent unexpected deletion
+						return await helpers.DeleteItemsAsync(history.Source, DeleteConfirmationPolicies.Always, true, false);
 					}
 					break;
 				case FileOperationType.CreateLink: // Opposite: Delete created items
 					if (!IsHistoryNull(history.Destination))
 					{
-						return await helpers.DeleteItemsAsync(history.Destination, true, true, false); // Show a dialog to prevent unexpected deletion
+						// Show a dialog regardless of the setting to prevent unexpected deletion
+						return await helpers.DeleteItemsAsync(history.Destination, DeleteConfirmationPolicies.Always, true, false);
 					}
 					break;
 				case FileOperationType.Rename: // Opposite: Restore original item names
@@ -61,7 +63,8 @@ public async Task<ReturnResult> Undo(IStorageHistory history)
 				case FileOperationType.Copy: // Opposite: Delete copied items
 					if (!IsHistoryNull(history.Destination))
 					{
-						return await helpers.DeleteItemsAsync(history.Destination, true, true, false); // Show a dialog to prevent unexpected deletion
+						// Show a dialog regardless of the setting to prevent unexpected deletion
+						return await helpers.DeleteItemsAsync(history.Destination, DeleteConfirmationPolicies.Always, true, false);
 					}
 					break;
 				case FileOperationType.Move: // Opposite: Move the items to original directory
diff --git a/src/Files.App/Helpers/NavigationHelpers.cs b/src/Files.App/Helpers/NavigationHelpers.cs
@@ -179,7 +179,7 @@ public static async Task<bool> OpenPath(string path, IShellPage associatedInstan
 
 						// Delete shortcut
 						var shortcutItem = StorageHelpers.FromPathAndType(path, FilesystemItemType.File);
-						await associatedInstance.FilesystemHelpers.DeleteItemAsync(shortcutItem, false, false, true);
+						await associatedInstance.FilesystemHelpers.DeleteItemAsync(shortcutItem, DeleteConfirmationPolicies.Never, false, true);
 					}
 				}
 				else if (isReparsePoint)
diff --git a/src/Files.App/Helpers/RecycleBinHelpers.cs b/src/Files.App/Helpers/RecycleBinHelpers.cs
@@ -63,9 +63,9 @@ public static async Task EmptyRecycleBin()
 				SecondaryButtonText = "Cancel".GetLocalizedResource(),
 				DefaultButton = ContentDialogButton.Primary
 			};
-			ContentDialogResult result = await SetContentDialogRoot(ConfirmEmptyBinDialog).ShowAsync();
 
-			if (result == ContentDialogResult.Primary)
+			if (userSettingsService.FoldersSettingsService.DeleteConfirmationPolicy is DeleteConfirmationPolicies.Never
+				|| await SetContentDialogRoot(ConfirmEmptyBinDialog).ShowAsync() == ContentDialogResult.Primary)
 			{
 				string bannerTitle = "EmptyRecycleBin".GetLocalizedResource();
 				var banner = App.OngoingTasksViewModel.PostBanner(
@@ -173,7 +173,7 @@ public static async Task DeleteItem(IShellPage associatedInstance)
 			var items = associatedInstance.SlimContentPage.SelectedItems.ToList().Select((item) => StorageHelpers.FromPathAndType(
 				item.ItemPath,
 				item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory));
-			await associatedInstance.FilesystemHelpers.DeleteItemsAsync(items, userSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog, false, true);
+			await associatedInstance.FilesystemHelpers.DeleteItemsAsync(items, userSettingsService.FoldersSettingsService.DeleteConfirmationPolicy, false, true);
 		}
 	}
 }
diff --git a/src/Files.App/ServicesImplementation/Settings/FoldersSettingsService.cs b/src/Files.App/ServicesImplementation/Settings/FoldersSettingsService.cs
@@ -238,10 +238,10 @@ public bool ShowThumbnails
 			set => Set(value);
 		}
 
-		public bool ShowConfirmDeleteDialog
+		public DeleteConfirmationPolicies DeleteConfirmationPolicy
 		{
-			get => Get(true);
-			set => Set(value);
+			get => (DeleteConfirmationPolicies)Get((long)DeleteConfirmationPolicies.Always);
+			set => Set((long)value);
 		}
 
 		public bool SelectFilesOnHover
@@ -283,7 +283,7 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 				case nameof(CalculateFolderSizes):
 				case nameof(ShowFileExtensions):
 				case nameof(ShowThumbnails):
-				case nameof(ShowConfirmDeleteDialog):
+				case nameof(DeleteConfirmationPolicy):
 				case nameof(SelectFilesOnHover):
 				case nameof(ShowSelectionCheckboxes):
 				case nameof(DoubleClickToGoUp):
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
@@ -2913,4 +2913,13 @@
   <data name="WindowsVersion" xml:space="preserve">
     <value>Windows version</value>
   </data>
+  <data name="Always" xml:space="preserve">
+    <value>Always</value>
+  </data>
+  <data name="PermanentDeletionOnly" xml:space="preserve">
+    <value>Permanent deletion only</value>
+  </data>
+  <data name="Never" xml:space="preserve">
+    <value>Never</value>
+  </data>
 </root>
diff --git a/src/Files.App/ViewModels/SettingsViewModels/FoldersViewModel.cs b/src/Files.App/ViewModels/SettingsViewModels/FoldersViewModel.cs
@@ -21,6 +21,7 @@ public FoldersViewModel()
 			SelectedDefaultLayoutModeIndex = (int)DefaultLayoutMode;
 			SelectedDefaultSortingIndex = UserSettingsService.FoldersSettingsService.DefaultSortOption == SortOption.FileTag ? FileTagSortingIndex : (int)UserSettingsService.FoldersSettingsService.DefaultSortOption;
 			SelectedDefaultGroupingIndex = UserSettingsService.FoldersSettingsService.DefaultGroupOption == GroupOption.FileTag ? FileTagGroupingIndex : (int)UserSettingsService.FoldersSettingsService.DefaultGroupOption;
+			SelectedDeleteConfirmationPolicyIndex = (int)DeleteConfirmationPolicy;
 		}
 
 		// Properties
@@ -39,6 +40,20 @@ public int SelectedDefaultLayoutModeIndex
 			}
 		}
 
+		private int selectedDeleteConfirmationPolicyIndex;
+		public int SelectedDeleteConfirmationPolicyIndex
+		{
+			get => selectedDeleteConfirmationPolicyIndex;
+			set
+			{
+				if (SetProperty(ref selectedDeleteConfirmationPolicyIndex, value))
+				{
+					OnPropertyChanged(nameof(SelectedDeleteConfirmationPolicyIndex));
+					DeleteConfirmationPolicy = (DeleteConfirmationPolicies)value;
+				}
+			}
+		}
+
 		public bool SyncFolderPreferencesAcrossDirectories
 		{
 			get => UserSettingsService.FoldersSettingsService.SyncFolderPreferencesAcrossDirectories;
@@ -315,14 +330,14 @@ public bool ShowThumbnails
 			}
 		}
 
-		public bool ShowConfirmDeleteDialog
+		public DeleteConfirmationPolicies DeleteConfirmationPolicy
 		{
-			get => UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog;
+			get => UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy;
 			set
 			{
-				if (value != UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog)
+				if (value != UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy)
 				{
-					UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog = value;
+					UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy = value;
 					OnPropertyChanged();
 				}
 			}
diff --git a/src/Files.App/Views/ColumnShellPage.xaml.cs b/src/Files.App/Views/ColumnShellPage.xaml.cs
@@ -714,7 +714,7 @@ private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, Keybo
 						var items = SlimContentPage.SelectedItems.ToList().Select((item) => StorageHelpers.FromPathAndType(
 							item.ItemPath,
 							item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory));
-						await FilesystemHelpers.DeleteItemsAsync(items, UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog, true, true);
+						await FilesystemHelpers.DeleteItemsAsync(items, UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy, true, true);
 					}
 
 					break;
@@ -758,7 +758,7 @@ private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, Keybo
 						var items = SlimContentPage.SelectedItems.ToList().Select((item) => StorageHelpers.FromPathAndType(
 							item.ItemPath,
 							item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory));
-						await FilesystemHelpers.DeleteItemsAsync(items, UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog, false, true);
+						await FilesystemHelpers.DeleteItemsAsync(items, UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy, false, true);
 					}
 
 					break;
diff --git a/src/Files.App/Views/ModernShellPage.xaml.cs b/src/Files.App/Views/ModernShellPage.xaml.cs
@@ -725,7 +725,7 @@ private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, Keybo
 						var items = SlimContentPage.SelectedItems.ToList().Select((item) => StorageHelpers.FromPathAndType(
 							item.ItemPath,
 							item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory));
-						await FilesystemHelpers.DeleteItemsAsync(items, UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog, true, true);
+						await FilesystemHelpers.DeleteItemsAsync(items, UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy, true, true);
 					}
 
 					break;
@@ -761,7 +761,7 @@ private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, Keybo
 						var items = SlimContentPage.SelectedItems.ToList().Select((item) => StorageHelpers.FromPathAndType(
 							item.ItemPath,
 							item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory));
-						await FilesystemHelpers.DeleteItemsAsync(items, UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog, false, true);
+						await FilesystemHelpers.DeleteItemsAsync(items, UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy, false, true);
 					}
 
 					break;
diff --git a/src/Files.App/Views/SettingsPages/Folders.xaml b/src/Files.App/Views/SettingsPages/Folders.xaml
@@ -283,11 +283,11 @@
 					<FontIcon Glyph="&#xE107;" />
 				</local:SettingsBlockControl.Icon>
 
-				<ToggleSwitch
-					x:Name="ShowConfirmDeleteDialogSwitch"
-					AutomationProperties.Name="{helpers:ResourceString Name=ShowConfirmationWhenDeletingItems}"
-					IsOn="{x:Bind ViewModel.ShowConfirmDeleteDialog, Mode=TwoWay}"
-					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+				<ComboBox AutomationProperties.Name="{helpers:ResourceString Name=ShowConfirmationWhenDeletingItems}" SelectedIndex="{x:Bind ViewModel.SelectedDeleteConfirmationPolicyIndex, Mode=TwoWay}">
+					<ComboBoxItem Content="{helpers:ResourceString Name=Always}" />
+					<ComboBoxItem Content="{helpers:ResourceString Name=PermanentDeletionOnly}" />
+					<ComboBoxItem Content="{helpers:ResourceString Name=Never}" />
+				</ComboBox>
 			</local:SettingsBlockControl>
 
 			<!--  Select On Hover  -->
diff --git a/src/Files.Backend/Services/Settings/IFoldersSettingsService.cs b/src/Files.Backend/Services/Settings/IFoldersSettingsService.cs
@@ -169,7 +169,7 @@ public interface IFoldersSettingsService : IBaseSettingsService, INotifyProperty
 		/// <summary>
 		/// Gets or sets a value indicating whether or not to show the delete confirmation dialog when deleting items.
 		/// </summary>
-		bool ShowConfirmDeleteDialog { get; set; }
+		DeleteConfirmationPolicies DeleteConfirmationPolicy { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating whether or not to select files and folders when hovering them.
diff --git a/src/Files.Shared/Enums/DeleteConfirmationPolicy.cs b/src/Files.Shared/Enums/DeleteConfirmationPolicy.cs
@@ -0,0 +1,9 @@
+﻿namespace Files.Shared.Enums
+{
+	public enum DeleteConfirmationPolicies : byte
+	{
+		Always,
+		PermanentOnly,
+		Never,
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ await DialogDisplayHelper.ShowDialogAsync(`
`116`	`116`
`117`	`117`	`#region Delete`
`118`	`118`
`119`		`- public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPath> source, bool showDialog, bool permanently, bool registerHistory)`
	`119`	`+ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPath> source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory)`
`120`	`120`	`{`
`121`	`121`	`source = await source.ToListAsync();`
`122`	`122`
`@@ -125,7 +125,8 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat`
`125`	`125`	`var deleteFromRecycleBin = source.Select(item => item.Path).Any(path => RecycleBinHelpers.IsPathUnderRecycleBin(path));`
`126`	`126`	`var canBeSentToBin = !deleteFromRecycleBin && await RecycleBinHelpers.HasRecycleBin(source.FirstOrDefault()?.Path);`
`127`	`127`
`128`		`- if (showDialog)`
	`128`	`+ if (showDialog is DeleteConfirmationPolicies.Always`
	`129`	`+ \|\| showDialog is DeleteConfirmationPolicies.PermanentOnly && (permanently \|\| !canBeSentToBin))`
`129`	`130`	`{`
`130`	`131`	`var incomingItems = new List<BaseFileSystemDialogItemViewModel>();`
`131`	`132`	`List<ShellFileItem>? binItems = null;`
`@@ -193,13 +194,13 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat`
`193`	`194`	`return returnStatus;`
`194`	`195`	`}`
`195`	`196`
`196`		`- public Task<ReturnResult> DeleteItemAsync(IStorageItemWithPath source, bool showDialog, bool permanently, bool registerHistory)`
	`197`	`+ public Task<ReturnResult> DeleteItemAsync(IStorageItemWithPath source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory)`
`197`	`198`	`=> DeleteItemsAsync(source.CreateEnumerable(), showDialog, permanently, registerHistory);`
`198`	`199`
`199`		`- public Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItem> source, bool showDialog, bool permanently, bool registerHistory)`
	`200`	`+ public Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItem> source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory)`
`200`	`201`	`=> DeleteItemsAsync(source.Select((item) => item.FromStorageItem()), showDialog, permanently, registerHistory);`
`201`	`202`
`202`		`- public Task<ReturnResult> DeleteItemAsync(IStorageItem source, bool showDialog, bool permanently, bool registerHistory)`
	`203`	`+ public Task<ReturnResult> DeleteItemAsync(IStorageItem source, DeleteConfirmationPolicies showDialog, bool permanently, bool registerHistory)`
`203`	`204`	`=> DeleteItemAsync(source.FromStorageItem(), showDialog, permanently, registerHistory);`
`204`	`205`
`205`	`206`	`#endregion Delete`
`@@ -258,7 +259,7 @@ public async Task<ReturnResult> PerformOperationTypeAsync(DataPackageOperation o`
`258`	`259`	`}`
`259`	`260`	`if (destination.StartsWith(CommonPaths.RecycleBinPath, StringComparison.Ordinal))`
`260`	`261`	`{`
`261`		`- return await RecycleItemsFromClipboard(packageView, destination, UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog, registerHistory);`
	`262`	`+ return await RecycleItemsFromClipboard(packageView, destination, UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy, registerHistory);`
`262`	`263`	`}`
`263`	`264`	`else if (operation.HasFlag(DataPackageOperation.Copy))`
`264`	`265`	`{`
`@@ -625,7 +626,7 @@ public async Task<ReturnResult> CreateShortcutFromClipboard(DataPackageView pack`
`625`	`626`	`return returnStatus;`
`626`	`627`	`}`
`627`	`628`
`628`		`- public async Task<ReturnResult> RecycleItemsFromClipboard(DataPackageView packageView, string destination, bool showDialog, bool registerHistory)`
	`629`	`+ public async Task<ReturnResult> RecycleItemsFromClipboard(DataPackageView packageView, string destination, DeleteConfirmationPolicies showDialog, bool registerHistory)`
`629`	`630`	`{`
`630`	`631`	`if (!HasDraggedStorageItems(packageView))`
`631`	`632`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,15 @@ public async Task<ReturnResult> Undo(IStorageHistory history)`
`38`	`38`	`case FileOperationType.CreateNew: // Opposite: Delete created items`
`39`	`39`	`if (!IsHistoryNull(history.Source))`
`40`	`40`	`{`
`41`		`- return await helpers.DeleteItemsAsync(history.Source, true, true, false); // Show a dialog to prevent unexpected deletion`
	`41`	`+ // Show a dialog regardless of the setting to prevent unexpected deletion`
	`42`	`+ return await helpers.DeleteItemsAsync(history.Source, DeleteConfirmationPolicies.Always, true, false);`
`42`	`43`	`}`
`43`	`44`	`break;`
`44`	`45`	`case FileOperationType.CreateLink: // Opposite: Delete created items`
`45`	`46`	`if (!IsHistoryNull(history.Destination))`
`46`	`47`	`{`
`47`		`- return await helpers.DeleteItemsAsync(history.Destination, true, true, false); // Show a dialog to prevent unexpected deletion`
	`48`	`+ // Show a dialog regardless of the setting to prevent unexpected deletion`
	`49`	`+ return await helpers.DeleteItemsAsync(history.Destination, DeleteConfirmationPolicies.Always, true, false);`
`48`	`50`	`}`
`49`	`51`	`break;`
`50`	`52`	`case FileOperationType.Rename: // Opposite: Restore original item names`
`@@ -61,7 +63,8 @@ public async Task<ReturnResult> Undo(IStorageHistory history)`
`61`	`63`	`case FileOperationType.Copy: // Opposite: Delete copied items`
`62`	`64`	`if (!IsHistoryNull(history.Destination))`
`63`	`65`	`{`
`64`		`- return await helpers.DeleteItemsAsync(history.Destination, true, true, false); // Show a dialog to prevent unexpected deletion`
	`66`	`+ // Show a dialog regardless of the setting to prevent unexpected deletion`
	`67`	`+ return await helpers.DeleteItemsAsync(history.Destination, DeleteConfirmationPolicies.Always, true, false);`
`65`	`68`	`}`
`66`	`69`	`break;`
`67`	`70`	`case FileOperationType.Move: // Opposite: Move the items to original directory`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public static async Task<bool> OpenPath(string path, IShellPage associatedInstan`
`179`	`179`
`180`	`180`	`// Delete shortcut`
`181`	`181`	`var shortcutItem = StorageHelpers.FromPathAndType(path, FilesystemItemType.File);`
`182`		`- await associatedInstance.FilesystemHelpers.DeleteItemAsync(shortcutItem, false, false, true);`
	`182`	`+ await associatedInstance.FilesystemHelpers.DeleteItemAsync(shortcutItem, DeleteConfirmationPolicies.Never, false, true);`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`	`else if (isReparsePoint)`
Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,9 @@ public static async Task EmptyRecycleBin()`
`63`	`63`	`SecondaryButtonText = "Cancel".GetLocalizedResource(),`
`64`	`64`	`DefaultButton = ContentDialogButton.Primary`
`65`	`65`	`};`
`66`		`- ContentDialogResult result = await SetContentDialogRoot(ConfirmEmptyBinDialog).ShowAsync();`
`67`	`66`
`68`		`- if (result == ContentDialogResult.Primary)`
	`67`	`+ if (userSettingsService.FoldersSettingsService.DeleteConfirmationPolicy is DeleteConfirmationPolicies.Never`
	`68`	`+ \|\| await SetContentDialogRoot(ConfirmEmptyBinDialog).ShowAsync() == ContentDialogResult.Primary)`
`69`	`69`	`{`
`70`	`70`	`string bannerTitle = "EmptyRecycleBin".GetLocalizedResource();`
`71`	`71`	`var banner = App.OngoingTasksViewModel.PostBanner(`
`@@ -173,7 +173,7 @@ public static async Task DeleteItem(IShellPage associatedInstance)`
`173`	`173`	`var items = associatedInstance.SlimContentPage.SelectedItems.ToList().Select((item) => StorageHelpers.FromPathAndType(`
`174`	`174`	`item.ItemPath,`
`175`	`175`	`item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory));`
`176`		`- await associatedInstance.FilesystemHelpers.DeleteItemsAsync(items, userSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog, false, true);`
	`176`	`+ await associatedInstance.FilesystemHelpers.DeleteItemsAsync(items, userSettingsService.FoldersSettingsService.DeleteConfirmationPolicy, false, true);`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public FoldersViewModel()`
`21`	`21`	`SelectedDefaultLayoutModeIndex = (int)DefaultLayoutMode;`
`22`	`22`	`SelectedDefaultSortingIndex = UserSettingsService.FoldersSettingsService.DefaultSortOption == SortOption.FileTag ? FileTagSortingIndex : (int)UserSettingsService.FoldersSettingsService.DefaultSortOption;`
`23`	`23`	`SelectedDefaultGroupingIndex = UserSettingsService.FoldersSettingsService.DefaultGroupOption == GroupOption.FileTag ? FileTagGroupingIndex : (int)UserSettingsService.FoldersSettingsService.DefaultGroupOption;`
	`24`	`+ SelectedDeleteConfirmationPolicyIndex = (int)DeleteConfirmationPolicy;`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`// Properties`
`@@ -39,6 +40,20 @@ public int SelectedDefaultLayoutModeIndex`
`39`	`40`	`}`
`40`	`41`	`}`
`41`	`42`
	`43`	`+ private int selectedDeleteConfirmationPolicyIndex;`
	`44`	`+ public int SelectedDeleteConfirmationPolicyIndex`
	`45`	`+ {`
	`46`	`+ get => selectedDeleteConfirmationPolicyIndex;`
	`47`	`+ set`
	`48`	`+ {`
	`49`	`+ if (SetProperty(ref selectedDeleteConfirmationPolicyIndex, value))`
	`50`	`+ {`
	`51`	`+ OnPropertyChanged(nameof(SelectedDeleteConfirmationPolicyIndex));`
	`52`	`+ DeleteConfirmationPolicy = (DeleteConfirmationPolicies)value;`
	`53`	`+ }`
	`54`	`+ }`
	`55`	`+ }`
	`56`	`+`
`42`	`57`	`public bool SyncFolderPreferencesAcrossDirectories`
`43`	`58`	`{`
`44`	`59`	`get => UserSettingsService.FoldersSettingsService.SyncFolderPreferencesAcrossDirectories;`
`@@ -315,14 +330,14 @@ public bool ShowThumbnails`
`315`	`330`	`}`
`316`	`331`	`}`
`317`	`332`
`318`		`- public bool ShowConfirmDeleteDialog`
	`333`	`+ public DeleteConfirmationPolicies DeleteConfirmationPolicy`
`319`	`334`	`{`
`320`		`- get => UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog;`
	`335`	`+ get => UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy;`
`321`	`336`	`set`
`322`	`337`	`{`
`323`		`- if (value != UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog)`
	`338`	`+ if (value != UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy)`
`324`	`339`	`{`
`325`		`- UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog = value;`
	`340`	`+ UserSettingsService.FoldersSettingsService.DeleteConfirmationPolicy = value;`
`326`	`341`	`OnPropertyChanged();`
`327`	`342`	`}`
`328`	`343`	`}`