Replaced

Author: 0x5bfa

src/Files.App/Helpers/Application/AppLifecycleHelper.cs

@@ -197,6 +197,7 @@ public static IHost ConfigureHost()
 					.AddSingleton<IStartMenuService, StartMenuService>()
 					.AddSingleton<IStorageCacheService, StorageCacheService>()
 					.AddSingleton<IStorageArchiveService, StorageArchiveService>()
+					.AddSingleton<IStorageSecurityService, StorageSecurityService>()
 					.AddSingleton<IWindowsCompatibilityService, WindowsCompatibilityService>()
 					// ViewModels
 					.AddSingleton<MainPageViewModel>()

src/Files.App/Services/Storage/StorageSecurityService.cs

@@ -8,7 +8,7 @@
 using Windows.Win32.Security.Authorization;
 using SystemSecurity = System.Security.AccessControl;
 
-namespace Files.App.Services.Storage
+namespace Files.App.Services
 {
 	/// <inheritdoc cref="IStorageSecurityService"/>
 	public class StorageSecurityService : IStorageSecurityService

src/Files.App/Utils/Storage/Helpers/FileSecurityHelpers.cs

@@ -9,6 +9,8 @@ namespace Files.App.ViewModels.Properties
 {
 	public sealed class SecurityAdvancedViewModel : ObservableObject
 	{
+		private readonly IStorageSecurityService StorageSecurityService = Ioc.Default.GetRequiredService<IStorageSecurityService>();
+
 		private readonly PropertiesPageNavigationParameter _navigationParameter;
 
 		private readonly Window _window;
@@ -166,7 +168,7 @@ private void LoadShieldIconResource()
 
 		private void LoadAccessControlEntry()
 		{
-			var error = FileSecurityHelpers.GetAccessControlList(_path, _isFolder, out _AccessControlList);
+			var error = StorageSecurityService.GetAccessControlList(_path, _isFolder, out _AccessControlList);
 			SelectedAccessControlEntry = AccessControlList.AccessControlEntries.FirstOrDefault();
 
 			if (!AccessControlList.IsValid)
@@ -204,7 +206,7 @@ private async Task ExecuteChangeOwnerCommandAsync()
 			await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 			{
 				// Set owner
-				FileSecurityHelpers.SetOwner(_path, sid);
+				StorageSecurityService.SetOwner(_path, sid);
 
 				// Reload
 				LoadAccessControlEntry();
@@ -221,10 +223,10 @@ private async Task ExecuteAddAccessControlEntryCommandAsync()
 			await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 			{
 				// Run Win32API
-				var win32Result = FileSecurityHelpers.AddAccessControlEntry(_path, sid);
+				var win32Result = StorageSecurityService.AddAccessControlEntry(_path, sid);
 
 				// Add a new ACE to the ACL
-				var ace = FileSecurityHelpers.InitializeDefaultAccessControlEntry(_isFolder, sid);
+				var ace = StorageSecurityService.InitializeDefaultAccessControlEntry(_isFolder, sid);
 				AccessControlList.AccessControlEntries.Insert(0, ace);
 			});
 		}
@@ -240,7 +242,7 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 				var index = AccessControlList.AccessControlEntries.IndexOf(SelectedAccessControlEntry);
 
 				// Run Win32API
-				var win32Result = FileSecurityHelpers.RemoveAccessControlEntry(_path, (uint)index);
+				var win32Result = StorageSecurityService.RemoveAccessControlEntry(_path, (uint)index);
 
 				// Remove the ACE
 				AccessControlList.AccessControlEntries.Remove(SelectedAccessControlEntry);

src/Files.App/ViewModels/Properties/SecurityAdvancedViewModel.cs

@@ -10,6 +10,8 @@ namespace Files.App.ViewModels.Properties
 {
 	public sealed class SecurityViewModel : ObservableObject
 	{
+		private readonly IStorageSecurityService StorageSecurityService = Ioc.Default.GetRequiredService<IStorageSecurityService>();
+
 		private readonly PropertiesPageNavigationParameter _navigationParameter;
 
 		private readonly Window _window;
@@ -89,7 +91,7 @@ public SecurityViewModel(PropertiesPageNavigationParameter parameter)
 					break;
 			};
 
-			var error = FileSecurityHelpers.GetAccessControlList(_path, _isFolder, out _AccessControlList);
+			var error = StorageSecurityService.GetAccessControlList(_path, _isFolder, out _AccessControlList);
 			_SelectedAccessControlEntry = AccessControlList.AccessControlEntries.FirstOrDefault();
 
 			if (!AccessControlList.IsValid)
@@ -119,10 +121,10 @@ private async Task ExecuteAddAccessControlEntryCommandAsync()
 			await MainWindow.Instance.DispatcherQueue.EnqueueAsync(() =>
 			{
 				// Run Win32API
-				var win32Result = FileSecurityHelpers.AddAccessControlEntry(_path, sid);
+				var win32Result = StorageSecurityService.AddAccessControlEntry(_path, sid);
 
 				// Add a new ACE to the ACL
-				var ace = FileSecurityHelpers.InitializeDefaultAccessControlEntry(_isFolder, sid);
+				var ace = StorageSecurityService.InitializeDefaultAccessControlEntry(_isFolder, sid);
 				AccessControlList.AccessControlEntries.Insert(0, ace);
 			});
 		}
@@ -135,7 +137,7 @@ await MainWindow.Instance.DispatcherQueue.EnqueueAsync(() =>
 				var index = AccessControlList.AccessControlEntries.IndexOf(SelectedAccessControlEntry);
 
 				// Run Win32API
-				var win32Result = FileSecurityHelpers.RemoveAccessControlEntry(_path, (uint)index);
+				var win32Result = StorageSecurityService.RemoveAccessControlEntry(_path, (uint)index);
 
 				// Remove the ACE
 				AccessControlList.AccessControlEntries.Remove(SelectedAccessControlEntry);