Fix: Fixed some null reference warnings (#13776)

files-community · Nov 10, 2023 · 6a35907 · 6a35907
1 parent cf1f09c
commit 6a35907
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 14 deletions.
diff --git a/src/Files.App/Actions/Content/Archives/Compress/CompressIntoArchiveAction.cs b/src/Files.App/Actions/Content/Archives/Compress/CompressIntoArchiveAction.cs
@@ -20,6 +20,9 @@ public CompressIntoArchiveAction()
 
 		public override async Task ExecuteAsync()
 		{
+			if (context.ShellPage is null)
+				return;
+
 			var (sources, directory, fileName) = CompressHelper.GetCompressDestination(context.ShellPage);
 
 			var dialog = new CreateArchiveDialog

diff --git a/src/Files.App/Actions/Content/RefreshItemsAction.cs b/src/Files.App/Actions/Content/RefreshItemsAction.cs
@@ -34,7 +34,10 @@ public RefreshItemsAction()
 
 		public async Task ExecuteAsync()
 		{
-			context.ShellPage?.Refresh_ClickAsync();
+			if (context.ShellPage is null)
+				return;
+
+			await context.ShellPage.Refresh_Click();
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

diff --git a/src/Files.App/Actions/Content/Run/RunWithPowershellAction.cs b/src/Files.App/Actions/Content/Run/RunWithPowershellAction.cs
@@ -31,7 +31,7 @@ public RunWithPowershellAction()
 
 		public Task ExecuteAsync()
 		{
-			return Win32API.RunPowershellCommandAsync($"{context.ShellPage?.SlimContentPage?.SelectedItem.ItemPath}", false);
+			return Win32API.RunPowershellCommandAsync($"{context.ShellPage?.SlimContentPage?.SelectedItem?.ItemPath}", false);
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

diff --git a/src/Files.App/Actions/FileSystem/CopyItemAction.cs b/src/Files.App/Actions/FileSystem/CopyItemAction.cs
@@ -14,7 +14,7 @@ public string Description
 			=> "CopyItemDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new RichGlyph(opacityStyle: "ColorIconCopy");
+			=> new(opacityStyle: "ColorIconCopy");
 
 		public HotKey HotKey
 			=> new(Keys.C, KeyModifiers.Ctrl);

diff --git a/src/Files.App/Actions/FileSystem/OpenFileLocationAction.cs b/src/Files.App/Actions/FileSystem/OpenFileLocationAction.cs
@@ -19,6 +19,7 @@ public RichGlyph Glyph
 			=> new(baseGlyph: "\uE8DA");
 
 		public bool IsExecutable =>
+			context.ShellPage is not null &&
 			context.HasSelection &&
 			context.SelectedItem is ShortcutItem;
 
@@ -31,18 +32,21 @@ public OpenFileLocationAction()
 
 		public async Task ExecuteAsync()
 		{
+			if (context.ShellPage?.FilesystemViewModel is null)
+				return;
+
 			var item = context.SelectedItem as ShortcutItem;
 
 			if (string.IsNullOrWhiteSpace(item?.TargetPath))
 				return;
 
 			// Check if destination path exists
 			var folderPath = Path.GetDirectoryName(item.TargetPath);
-			var destFolder = await context.ShellPage?.FilesystemViewModel.GetFolderWithPathFromPathAsync(folderPath);
+			var destFolder = await context.ShellPage.FilesystemViewModel.GetFolderWithPathFromPathAsync(folderPath);
 
 			if (destFolder)
 			{
-				context.ShellPage?.NavigateWithArguments(context.ShellPage?.InstanceViewModel.FolderSettings.GetLayoutType(folderPath), new NavigationArguments()
+				context.ShellPage?.NavigateWithArguments(context.ShellPage.InstanceViewModel.FolderSettings.GetLayoutType(folderPath), new NavigationArguments()
 				{
 					NavPathParam = folderPath,
 					SelectItems = new[] { Path.GetFileName(item.TargetPath.TrimPath()) },

diff --git a/src/Files.App/Actions/FileSystem/OpenItemAction.cs b/src/Files.App/Actions/FileSystem/OpenItemAction.cs
@@ -102,6 +102,7 @@ public RichGlyph Glyph
 
 		public bool IsExecutable =>
 			context.HasSelection &&
+			context.ShellPage is not null &&
 			context.ShellPage.InstanceViewModel.IsPageTypeSearchResults;
 
 		public OpenParentFolderAction()
@@ -113,8 +114,14 @@ public OpenParentFolderAction()
 
 		public async Task ExecuteAsync()
 		{
+			if (context.ShellPage is null)
+				return;
+
 			var item = context.SelectedItem;
-			var folderPath = Path.GetDirectoryName(item.ItemPath.TrimEnd('\\'));
+			var folderPath = Path.GetDirectoryName(item?.ItemPath.TrimEnd('\\'));
+
+			if (folderPath is null || item is null)
+				return;
 
 			context.ShellPage.NavigateWithArguments(context.ShellPage.InstanceViewModel.FolderSettings.GetLayoutType(folderPath), new NavigationArguments()
 			{

diff --git a/src/Files.App/Actions/Navigation/OpenInNewWindowItemAction.cs b/src/Files.App/Actions/Navigation/OpenInNewWindowItemAction.cs
@@ -21,6 +21,8 @@ public RichGlyph Glyph
 			=> new(opacityStyle: "ColorIconOpenInNewWindow");
 
 		public bool IsExecutable =>
+			context.ShellPage is not null &&
+			context.ShellPage.SlimContentPage is not null &&
 			context.SelectedItems.Count <= 5 &&
 			context.SelectedItems.Where(x => x.IsFolder == true).Count() == context.SelectedItems.Count &&
 			userSettingsService.GeneralSettingsService.ShowOpenInNewWindow;
@@ -35,6 +37,9 @@ public OpenInNewWindowItemAction()
 
 		public async Task ExecuteAsync()
 		{
+			if (context.ShellPage?.SlimContentPage?.SelectedItems is null)
+				return;
+
 			List<ListedItem> items = context.ShellPage.SlimContentPage.SelectedItems;
 
 			foreach (ListedItem listedItem in items)

diff --git a/src/Files.App/Actions/Start/PinToStartAction.cs b/src/Files.App/Actions/Start/PinToStartAction.cs
@@ -16,21 +16,24 @@ public string Description
 		public RichGlyph Glyph
 			=> new(opacityStyle: "ColorIconPinToFavorites");
 
+		public bool IsExecutable =>
+			context.ShellPage is not null;
+
 		public PinToStartAction()
 		{
 			context = Ioc.Default.GetRequiredService<IContentPageContext>();
 		}
 
 		public async Task ExecuteAsync()
 		{
-			if (context.SelectedItems.Count > 0)
+			if (context.SelectedItems.Count > 0 && context.ShellPage?.SlimContentPage?.SelectedItems is not null)
 			{
-				foreach (ListedItem listedItem in context.ShellPage?.SlimContentPage.SelectedItems)
+				foreach (ListedItem listedItem in context.ShellPage.SlimContentPage.SelectedItems)
 					await App.SecondaryTileHelper.TryPinFolderAsync(listedItem.ItemPath, listedItem.Name);
 			}
-			else
+			else if (context.ShellPage?.FilesystemViewModel?.CurrentFolder is not null)
 			{
-				await App.SecondaryTileHelper.TryPinFolderAsync(context.ShellPage?.FilesystemViewModel.CurrentFolder.ItemPath, context.ShellPage?.FilesystemViewModel.CurrentFolder.Name);
+				await App.SecondaryTileHelper.TryPinFolderAsync(context.ShellPage.FilesystemViewModel.CurrentFolder.ItemPath, context.ShellPage.FilesystemViewModel.CurrentFolder.Name);
 			}
 		}
 	}

diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs
@@ -366,7 +366,7 @@ protected async void ShellPage_TextChanged(ISearchBox sender, SearchBoxTextChang
 
 		protected void ShellPage_RefreshRequested(object sender, EventArgs e)
 		{
-			Refresh_ClickAsync();
+			Refresh_Click();
 		}
 
 		protected void AppSettings_SortDirectionPreferenceUpdated(object sender, SortDirection e)
@@ -511,10 +511,10 @@ public Task TabItemDrop(object sender, DragEventArgs e)
 		public async Task RefreshIfNoWatcherExistsAsync()
 		{
 			if (FilesystemViewModel.HasNoWatcher)
-				await Refresh_ClickAsync();
+				await Refresh_Click();
 		}
 
-		public async Task Refresh_ClickAsync()
+		public async Task Refresh_Click()
 		{
 			if (InstanceViewModel.IsPageTypeSearchResults)
 			{

diff --git a/src/Files.App/Views/Shells/IShellPage.cs b/src/Files.App/Views/Shells/IShellPage.cs
@@ -38,7 +38,7 @@ public interface IShellPage : ITabBarItemContent, IMultiPaneInfo, IDisposable, I
 
 		Task RefreshIfNoWatcherExistsAsync();
 
-		Task Refresh_ClickAsync();
+		Task Refresh_Click();
 
 		void Back_Click();