Fix: Fixed some null reference warnings (#13776)

yaira2 · web-flow · commit 6a359077ff70 · 2023-11-10T10:49:57.000-05:00
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();
 

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@ public CompressIntoArchiveAction()`
`20`	`20`
`21`	`21`	`public override async Task ExecuteAsync()`
`22`	`22`	`{`
	`23`	`+ if (context.ShellPage is null)`
	`24`	`+ return;`
	`25`	`+`
`23`	`26`	`var (sources, directory, fileName) = CompressHelper.GetCompressDestination(context.ShellPage);`
`24`	`27`
`25`	`28`	`var dialog = new CreateArchiveDialog`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,10 @@ public RefreshItemsAction()`
`34`	`34`
`35`	`35`	`public async Task ExecuteAsync()`
`36`	`36`	`{`
`37`		`- context.ShellPage?.Refresh_ClickAsync();`
	`37`	`+ if (context.ShellPage is null)`
	`38`	`+ return;`
	`39`	`+`
	`40`	`+ await context.ShellPage.Refresh_Click();`
`38`	`41`	`}`
`39`	`42`
`40`	`43`	`private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public RunWithPowershellAction()`
`31`	`31`
`32`	`32`	`public Task ExecuteAsync()`
`33`	`33`	`{`
`34`		`- return Win32API.RunPowershellCommandAsync($"{context.ShellPage?.SlimContentPage?.SelectedItem.ItemPath}", false);`
	`34`	`+ return Win32API.RunPowershellCommandAsync($"{context.ShellPage?.SlimContentPage?.SelectedItem?.ItemPath}", false);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -16,21 +16,24 @@ public string Description`
`16`	`16`	`public RichGlyph Glyph`
`17`	`17`	`=> new(opacityStyle: "ColorIconPinToFavorites");`
`18`	`18`
	`19`	`+ public bool IsExecutable =>`
	`20`	`+ context.ShellPage is not null;`
	`21`	`+`
`19`	`22`	`public PinToStartAction()`
`20`	`23`	`{`
`21`	`24`	`context = Ioc.Default.GetRequiredService<IContentPageContext>();`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`public async Task ExecuteAsync()`
`25`	`28`	`{`
`26`		`- if (context.SelectedItems.Count > 0)`
	`29`	`+ if (context.SelectedItems.Count > 0 && context.ShellPage?.SlimContentPage?.SelectedItems is not null)`
`27`	`30`	`{`
`28`		`- foreach (ListedItem listedItem in context.ShellPage?.SlimContentPage.SelectedItems)`
	`31`	`+ foreach (ListedItem listedItem in context.ShellPage.SlimContentPage.SelectedItems)`
`29`	`32`	`await App.SecondaryTileHelper.TryPinFolderAsync(listedItem.ItemPath, listedItem.Name);`
`30`	`33`	`}`
`31`		`- else`
	`34`	`+ else if (context.ShellPage?.FilesystemViewModel?.CurrentFolder is not null)`
`32`	`35`	`{`
`33`		`- await App.SecondaryTileHelper.TryPinFolderAsync(context.ShellPage?.FilesystemViewModel.CurrentFolder.ItemPath, context.ShellPage?.FilesystemViewModel.CurrentFolder.Name);`
	`36`	`+ await App.SecondaryTileHelper.TryPinFolderAsync(context.ShellPage.FilesystemViewModel.CurrentFolder.ItemPath, context.ShellPage.FilesystemViewModel.CurrentFolder.Name);`
`34`	`37`	`}`
`35`	`38`	`}`
`36`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ protected async void ShellPage_TextChanged(ISearchBox sender, SearchBoxTextChang`
`366`	`366`
`367`	`367`	`protected void ShellPage_RefreshRequested(object sender, EventArgs e)`
`368`	`368`	`{`
`369`		`- Refresh_ClickAsync();`
	`369`	`+ Refresh_Click();`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`protected void AppSettings_SortDirectionPreferenceUpdated(object sender, SortDirection e)`
`@@ -511,10 +511,10 @@ public Task TabItemDrop(object sender, DragEventArgs e)`
`511`	`511`	`public async Task RefreshIfNoWatcherExistsAsync()`
`512`	`512`	`{`
`513`	`513`	`if (FilesystemViewModel.HasNoWatcher)`
`514`		`- await Refresh_ClickAsync();`
	`514`	`+ await Refresh_Click();`
`515`	`515`	`}`
`516`	`516`
`517`		`- public async Task Refresh_ClickAsync()`
	`517`	`+ public async Task Refresh_Click()`
`518`	`518`	`{`
`519`	`519`	`if (InstanceViewModel.IsPageTypeSearchResults)`
`520`	`520`	`{`