Code Quality: Use OpenItem action for better reliability (#13831)

yaira2 · web-flow · commit c440e68580b8 · 2023-11-12T21:52:33.000-05:00
diff --git a/src/Files.App/Actions/FileSystem/OpenItemAction.cs b/src/Files.App/Actions/FileSystem/OpenItemAction.cs
@@ -39,7 +39,10 @@ public OpenItemAction()
 
 		public Task ExecuteAsync()
 		{
-			return NavigationHelpers.OpenSelectedItemsAsync(context.ShellPage);
+			if (context.ShellPage is not null)
+				return NavigationHelpers.OpenSelectedItemsAsync(context.ShellPage);
+
+			return Task.CompletedTask;
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
diff --git a/src/Files.App/Views/LayoutModes/BaseLayout.cs b/src/Files.App/Views/LayoutModes/BaseLayout.cs
@@ -41,6 +41,8 @@ public abstract class BaseLayout : Page, IBaseLayout, INotifyPropertyChanged
 
 		protected IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetService<IFileTagsSettingsService>()!;
 
+		public ICommandManager Commands { get; } = Ioc.Default.GetRequiredService<ICommandManager>();
+
 		public SelectedItemsPropertiesViewModel SelectedItemsPropertiesViewModel { get; }
 
 		public FolderSettingsViewModel? FolderSettings
@@ -1084,7 +1086,7 @@ private async void Item_DragOver(object sender, DragEventArgs e)
 								dragOverTimer.Stop();
 								ItemManipulationModel.SetSelectedItem(dragOverItem);
 								dragOverItem = null;
-								_ = NavigationHelpers.OpenSelectedItemsAsync(ParentShellPageInstance!, false);
+								Commands.OpenItem.ExecuteAsync();
 							}
 						},
 						TimeSpan.FromMilliseconds(1000), false);
diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs
@@ -346,7 +346,7 @@ ParentShellPageInstance is null ||
 			}
 		}
 
-		private void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
+		private async void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
 		{
 			doubleClickTimer.Stop();
 
@@ -358,21 +358,21 @@ private void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
 				{
 					case StorageItemTypes.File:
 						if (!UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
-							_ = NavigationHelpers.OpenSelectedItemsAsync(ParentShellPageInstance, false);
+							await Commands.OpenItem.ExecuteAsync();
 						break;
 					case StorageItemTypes.Folder:
 						if (!UserSettingsService.FoldersSettingsService.ColumnLayoutOpenFoldersWithOneClick)
 							ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = (item is ShortcutItem sht ? sht.TargetPath : item.ItemPath), ListView = FileList }, EventArgs.Empty);
 						break;
 					default:
 						if (UserSettingsService.FoldersSettingsService.DoubleClickToGoUp)
-							ParentShellPageInstance?.Up_Click();
+							await Commands.NavigateUp.ExecuteAsync();
 						break;
 				}
 			}
 			else if (UserSettingsService.FoldersSettingsService.DoubleClickToGoUp)
 			{
-				ParentShellPageInstance?.Up_Click();
+				await Commands.NavigateUp.ExecuteAsync();
 			}
 
 			ResetRenameDoubleClick();
@@ -408,7 +408,7 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
 			if (UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick && isItemFile)
 			{
 				ResetRenameDoubleClick();
-				_ = NavigationHelpers.OpenSelectedItemsAsync(ParentShellPageInstance, false);
+				await Commands.OpenItem.ExecuteAsync();
 			}
 			else if (item is not null)
 			{
diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml.cs
@@ -284,12 +284,12 @@ public void NavigateForward()
 			(ParentShellPageInstance as ModernShellPage)?.Forward_Click();
 		}
 
-		public void NavigateUp()
+		public async void NavigateUp()
 		{
 			if (ColumnHost.ActiveBlades?.Count > 1)
 				DismissOtherBlades(ColumnHost.ActiveBlades[ColumnHost.ActiveBlades.Count - 2]);
 			else
-				(ParentShellPageInstance as ModernShellPage)?.Up_Click();
+				await Commands.NavigateUp.ExecuteAsync();
 		}
 
 		public void MoveFocusToPreviousBlade(int currentBladeIndex)
diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using CommunityToolkit.WinUI.UI;
+using Files.App.Actions;
 using Files.App.UserControls.Selection;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
@@ -462,7 +463,7 @@ clickedItem is Microsoft.UI.Xaml.Shapes.Rectangle
 			if (UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
 			{
 				ResetRenameDoubleClick();
-				_ = NavigationHelpers.OpenSelectedItemsAsync(ParentShellPageInstance, false);
+				await Commands.OpenItem.ExecuteAsync();
 			}
 			else
 			{
@@ -482,17 +483,17 @@ clickedItem is Microsoft.UI.Xaml.Shapes.Rectangle
 			}
 		}
 
-		private void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
+		private async void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
 		{
 			// Skip opening selected items if the double tap doesn't capture an item
 			if ((e.OriginalSource as FrameworkElement)?.DataContext is ListedItem item
 				 && !UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
 			{
-				_ = NavigationHelpers.OpenSelectedItemsAsync(ParentShellPageInstance, false);
+				await Commands.OpenItem.ExecuteAsync();
 			}
 			else if (UserSettingsService.FoldersSettingsService.DoubleClickToGoUp)
 			{
-				ParentShellPageInstance?.Up_Click();
+				await Commands.NavigateUp.ExecuteAsync();
 			}
 			ResetRenameDoubleClick();
 		}
diff --git a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs
@@ -387,7 +387,7 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
 			if (UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
 			{
 				ResetRenameDoubleClick();
-				_ = NavigationHelpers.OpenSelectedItemsAsync(ParentShellPageInstance, false);
+				await Commands.OpenItem.ExecuteAsync();
 			}
 			else
 			{
@@ -417,14 +417,14 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
 			}
 		}
 
-		private void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
+		private async void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
 		{
 			// Skip opening selected items if the double tap doesn't capture an item
 			if ((e.OriginalSource as FrameworkElement)?.DataContext is ListedItem item &&
 				!UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
-				_ = NavigationHelpers.OpenSelectedItemsAsync(ParentShellPageInstance, false);
+				await Commands.OpenItem.ExecuteAsync();
 			else if (UserSettingsService.FoldersSettingsService.DoubleClickToGoUp)
-				ParentShellPageInstance.Up_Click();
+				await Commands.NavigateUp.ExecuteAsync();
 
 			ResetRenameDoubleClick();
 		}

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,10 @@ public OpenItemAction()`
`39`	`39`
`40`	`40`	`public Task ExecuteAsync()`
`41`	`41`	`{`
`42`		`- return NavigationHelpers.OpenSelectedItemsAsync(context.ShellPage);`
	`42`	`+ if (context.ShellPage is not null)`
	`43`	`+ return NavigationHelpers.OpenSelectedItemsAsync(context.ShellPage);`
	`44`	`+`
	`45`	`+ return Task.CompletedTask;`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ ParentShellPageInstance is null \|\|`
`346`	`346`	`}`
`347`	`347`	`}`
`348`	`348`
`349`		`- private void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)`
	`349`	`+ private async void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)`
`350`	`350`	`{`
`351`	`351`	`doubleClickTimer.Stop();`
`352`	`352`
`@@ -358,21 +358,21 @@ private void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)`
`358`	`358`	`{`
`359`	`359`	`case StorageItemTypes.File:`
`360`	`360`	`if (!UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)`
`361`		`- _ = NavigationHelpers.OpenSelectedItemsAsync(ParentShellPageInstance, false);`
	`361`	`+ await Commands.OpenItem.ExecuteAsync();`
`362`	`362`	`break;`
`363`	`363`	`case StorageItemTypes.Folder:`
`364`	`364`	`if (!UserSettingsService.FoldersSettingsService.ColumnLayoutOpenFoldersWithOneClick)`
`365`	`365`	`ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = (item is ShortcutItem sht ? sht.TargetPath : item.ItemPath), ListView = FileList }, EventArgs.Empty);`
`366`	`366`	`break;`
`367`	`367`	`default:`
`368`	`368`	`if (UserSettingsService.FoldersSettingsService.DoubleClickToGoUp)`
`369`		`- ParentShellPageInstance?.Up_Click();`
	`369`	`+ await Commands.NavigateUp.ExecuteAsync();`
`370`	`370`	`break;`
`371`	`371`	`}`
`372`	`372`	`}`
`373`	`373`	`else if (UserSettingsService.FoldersSettingsService.DoubleClickToGoUp)`
`374`	`374`	`{`
`375`		`- ParentShellPageInstance?.Up_Click();`
	`375`	`+ await Commands.NavigateUp.ExecuteAsync();`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`ResetRenameDoubleClick();`
`@@ -408,7 +408,7 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)`
`408`	`408`	`if (UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick && isItemFile)`
`409`	`409`	`{`
`410`	`410`	`ResetRenameDoubleClick();`
`411`		`- _ = NavigationHelpers.OpenSelectedItemsAsync(ParentShellPageInstance, false);`
	`411`	`+ await Commands.OpenItem.ExecuteAsync();`
`412`	`412`	`}`
`413`	`413`	`else if (item is not null)`
`414`	`414`	`{`
Original file line number	Diff line number	Diff line change
`@@ -284,12 +284,12 @@ public void NavigateForward()`
`284`	`284`	`(ParentShellPageInstance as ModernShellPage)?.Forward_Click();`
`285`	`285`	`}`
`286`	`286`
`287`		`- public void NavigateUp()`
	`287`	`+ public async void NavigateUp()`
`288`	`288`	`{`
`289`	`289`	`if (ColumnHost.ActiveBlades?.Count > 1)`
`290`	`290`	`DismissOtherBlades(ColumnHost.ActiveBlades[ColumnHost.ActiveBlades.Count - 2]);`
`291`	`291`	`else`
`292`		`- (ParentShellPageInstance as ModernShellPage)?.Up_Click();`
	`292`	`+ await Commands.NavigateUp.ExecuteAsync();`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`public void MoveFocusToPreviousBlade(int currentBladeIndex)`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// Licensed under the MIT License. See the LICENSE.`
`3`	`3`
`4`	`4`	`using CommunityToolkit.WinUI.UI;`
	`5`	`+using Files.App.Actions;`
`5`	`6`	`using Files.App.UserControls.Selection;`
`6`	`7`	`using Microsoft.UI.Input;`
`7`	`8`	`using Microsoft.UI.Xaml;`
`@@ -462,7 +463,7 @@ clickedItem is Microsoft.UI.Xaml.Shapes.Rectangle`
`462`	`463`	`if (UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)`
`463`	`464`	`{`
`464`	`465`	`ResetRenameDoubleClick();`
`465`		`- _ = NavigationHelpers.OpenSelectedItemsAsync(ParentShellPageInstance, false);`
	`466`	`+ await Commands.OpenItem.ExecuteAsync();`
`466`	`467`	`}`
`467`	`468`	`else`
`468`	`469`	`{`
`@@ -482,17 +483,17 @@ clickedItem is Microsoft.UI.Xaml.Shapes.Rectangle`
`482`	`483`	`}`
`483`	`484`	`}`
`484`	`485`
`485`		`- private void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)`
	`486`	`+ private async void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)`
`486`	`487`	`{`
`487`	`488`	`// Skip opening selected items if the double tap doesn't capture an item`
`488`	`489`	`if ((e.OriginalSource as FrameworkElement)?.DataContext is ListedItem item`
`489`	`490`	`&& !UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)`
`490`	`491`	`{`
`491`		`- _ = NavigationHelpers.OpenSelectedItemsAsync(ParentShellPageInstance, false);`
	`492`	`+ await Commands.OpenItem.ExecuteAsync();`
`492`	`493`	`}`
`493`	`494`	`else if (UserSettingsService.FoldersSettingsService.DoubleClickToGoUp)`
`494`	`495`	`{`
`495`		`- ParentShellPageInstance?.Up_Click();`
	`496`	`+ await Commands.NavigateUp.ExecuteAsync();`
`496`	`497`	`}`
`497`	`498`	`ResetRenameDoubleClick();`
`498`	`499`	`}`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)`
`387`	`387`	`if (UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)`
`388`	`388`	`{`
`389`	`389`	`ResetRenameDoubleClick();`
`390`		`- _ = NavigationHelpers.OpenSelectedItemsAsync(ParentShellPageInstance, false);`
	`390`	`+ await Commands.OpenItem.ExecuteAsync();`
`391`	`391`	`}`
`392`	`392`	`else`
`393`	`393`	`{`
`@@ -417,14 +417,14 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)`
`417`	`417`	`}`
`418`	`418`	`}`
`419`	`419`
`420`		`- private void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)`
	`420`	`+ private async void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)`
`421`	`421`	`{`
`422`	`422`	`// Skip opening selected items if the double tap doesn't capture an item`
`423`	`423`	`if ((e.OriginalSource as FrameworkElement)?.DataContext is ListedItem item &&`
`424`	`424`	`!UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)`
`425`		`- _ = NavigationHelpers.OpenSelectedItemsAsync(ParentShellPageInstance, false);`
	`425`	`+ await Commands.OpenItem.ExecuteAsync();`
`426`	`426`	`else if (UserSettingsService.FoldersSettingsService.DoubleClickToGoUp)`
`427`		`- ParentShellPageInstance.Up_Click();`
	`427`	`+ await Commands.NavigateUp.ExecuteAsync();`
`428`	`428`
`429`	`429`	`ResetRenameDoubleClick();`
`430`	`430`	`}`