Fix: Fixed freeze that occurred when right-clicking immediately after…

… launching the app (#13094)

src/Files.App/App.xaml.cs

@@ -176,7 +176,7 @@ await Task.WhenAll(
 
 				await Task.WhenAll(
 					JumpListHelper.InitializeUpdatesAsync(),
-					addItemService.GetNewEntriesAsync(),
+					addItemService.InitializeAsync(),
 					ContextMenu.WarmUpQueryContextMenuAsync()
 				);
 

src/Files.App/Dialogs/AddItemDialog.xaml.cs

@@ -37,7 +37,7 @@ private void ListView_ItemClick(object sender, ItemClickEventArgs e)
 
 		private async void AddItemDialog_Loaded(object sender, RoutedEventArgs e)
 		{
-			var itemTypes = await addItemService.GetNewEntriesAsync();
+			var itemTypes = addItemService.GetEntries();
 			await ViewModel.AddItemsToList(itemTypes);
 
 			// Focus on the list view so users can use keyboard navigation

src/Files.App/Helpers/MenuFlyout/ContextFlyoutItemHelper.cs

@@ -583,7 +583,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetNewItemItems(BaseLayoutVie
 
 			if (canCreateFileInPage)
 			{
-				var cachedNewContextMenuEntries = addItemService.GetNewEntriesAsync().Result;
+				var cachedNewContextMenuEntries = addItemService.GetEntries();
 				cachedNewContextMenuEntries?.ForEach(i =>
 				{
 					if (!string.IsNullOrEmpty(i.IconBase64))

src/Files.App/Services/AddItemService.cs

@@ -8,11 +8,13 @@ internal sealed class AddItemService : IAddItemService
 	{
 		private List<ShellNewEntry> _cached;
 
-		public async Task<List<ShellNewEntry>> GetNewEntriesAsync()
+		public async Task InitializeAsync()
 		{
-			if (_cached is null || _cached.Count == 0)
-				_cached = await ShellNewEntryExtensions.GetNewContextMenuEntries();
+			_cached = await ShellNewEntryExtensions.GetNewContextMenuEntries();
+		}
 
+		public List<ShellNewEntry> GetEntries()
+		{
 			return _cached;
 		}
 	}

src/Files.App/UserControls/InnerNavigationToolbar.xaml.cs

@@ -67,7 +67,7 @@ private void NewEmptySpace_Opening(object sender, object e)
 				shell.ForEach(x => NewEmptySpace.Items.Remove(x));
 				return;
 			}
-			var cachedNewContextMenuEntries = addItemService.GetNewEntriesAsync().Result;
+			var cachedNewContextMenuEntries = addItemService.GetEntries();
 			if (cachedNewContextMenuEntries is null)
 				return;
 			if (!NewEmptySpace.Items.Any(x => (x.Tag as string) == "CreateNewFile"))

src/Files.Core/Services/IAddItemService.cs

@@ -8,10 +8,16 @@ namespace Files.Core.Services
 	/// </summary>
 	public interface IAddItemService
 	{
+		/// <summary>
+		/// Initialize the service
+		/// </summary>
+		/// <returns>Task</returns>
+		Task InitializeAsync();
+
 		/// <summary>
 		/// Gets a list of the available item types
 		/// </summary>
 		/// <returns>List of the available item types</returns>
-		Task<List<ShellNewEntry>> GetNewEntriesAsync();
+		List<ShellNewEntry> GetEntries();
 	}
 }

src/Files.Core/ViewModels/Dialogs/AddItemDialog/AddItemDialogViewModel.cs

@@ -68,6 +68,9 @@ public async Task AddItemsToList(IEnumerable<ShellNewEntry> itemTypes)
 				}
 			});
 
+			if (itemTypes is null)
+				return;
+
 			foreach (var itemType in itemTypes)
 			{
 				IImageModel? imageModel = null;