Fix: Fixed some null ref warnings in decompress helper (#14086)

Co-authored-by: hishitetsu <[email protected]>
files-community · Nov 27, 2023 · d4ec2a0 · d4ec2a0
1 parent e1be096
commit d4ec2a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs
@@ -23,6 +23,9 @@ public DecompressArchive()
 
 		public override Task ExecuteAsync()
 		{
+			if (context.ShellPage is null)
+				return Task.CompletedTask;
+
 			return DecompressHelper.DecompressArchiveAsync(context.ShellPage);
 		}
 

diff --git a/src/Files.App/Utils/Archives/DecompressHelper.cs b/src/Files.App/Utils/Archives/DecompressHelper.cs
@@ -128,11 +128,11 @@ public static async Task DecompressArchiveAsync(IShellPage associatedInstance)
 			if (associatedInstance == null)
 				return;
 
-			BaseStorageFile archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(associatedInstance.SlimContentPage.SelectedItems.Count != 0
-				? associatedInstance.SlimContentPage.SelectedItem.ItemPath
-				: associatedInstance.FilesystemViewModel.WorkingDirectory);
+			BaseStorageFile archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(associatedInstance.SlimContentPage?.SelectedItems?.Count is null or 0
+				? associatedInstance.FilesystemViewModel.WorkingDirectory
+				: associatedInstance.SlimContentPage.SelectedItem.ItemPath);
 
-			if (archive is null)
+			if (archive?.Path is null)
 				return;
 
 			var isArchiveEncrypted = await FilesystemTasks.Wrap(() => DecompressHelper.IsArchiveEncrypted(archive));
@@ -177,7 +177,7 @@ public static async Task DecompressArchiveAsync(IShellPage associatedInstance)
 
 		public static async Task DecompressArchiveHereAsync(IShellPage associatedInstance)
 		{
-			if (associatedInstance?.SlimContentPage == null)
+			if (associatedInstance?.SlimContentPage?.SelectedItems == null)
 				return;
 
 			foreach (var selectedItem in associatedInstance.SlimContentPage.SelectedItems)
@@ -186,7 +186,7 @@ public static async Task DecompressArchiveHereAsync(IShellPage associatedInstanc
 				BaseStorageFile archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(selectedItem.ItemPath);
 				BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(associatedInstance.FilesystemViewModel.CurrentFolder.ItemPath);
 
-				if (archive is null)
+				if (archive?.Path is null)
 					return;
 
 				if (await FilesystemTasks.Wrap(() => IsArchiveEncrypted(archive)))
@@ -216,7 +216,7 @@ public static async Task DecompressArchiveHereAsync(IShellPage associatedInstanc
 
 		public static async Task DecompressArchiveToChildFolderAsync(IShellPage associatedInstance)
 		{
-			if (associatedInstance?.SlimContentPage == null)
+			if (associatedInstance?.SlimContentPage?.SelectedItems == null)
 				return;
 
 			foreach (var selectedItem in associatedInstance.SlimContentPage.SelectedItems)
@@ -227,7 +227,7 @@ public static async Task DecompressArchiveToChildFolderAsync(IShellPage associat
 				BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(associatedInstance.FilesystemViewModel.CurrentFolder.ItemPath);
 				BaseStorageFolder destinationFolder = null;
 
-				if (archive is null)
+				if (archive?.Path is null)
 					return;
 
 				if (await FilesystemTasks.Wrap(() => DecompressHelper.IsArchiveEncrypted(archive)))