Fix: Fixed blank pages menu in startup settings (#11032)

Author: jiejasonliu

src/Files.App/Filesystem/RecentItems.cs

@@ -84,8 +84,7 @@ public async Task UpdateRecentFilesAsync()
 		/// </summary>
 		public async Task UpdateRecentFoldersAsync()
 		{
-			// enumerate with fulltrust process
-			var enumeratedFolders = await Task.Run(() => ListRecentFolders());
+			var enumeratedFolders = await Task.Run(ListRecentFoldersAsync);	// run off the UI thread
 			if (enumeratedFolders is not null)
 			{
 				lock (recentFolders)
@@ -115,36 +114,44 @@ public async Task<List<RecentItem>> ListRecentFilesAsync()
 		/// <summary>
 		/// Enumerate recently accessed folders via `Windows\Recent`.
 		/// </summary>
-		public List<RecentItem> ListRecentFolders()
+		public async Task<List<RecentItem>> ListRecentFoldersAsync()
 		{
 			var recentItems = new List<RecentItem>();
 			var excludeMask = FileAttributes.Hidden;
 			var linkFilePaths = Directory.EnumerateFiles(CommonPaths.RecentItemsPath).Where(f => (new FileInfo(f).Attributes & excludeMask) == 0);
 
-			foreach (var linkFilePath in linkFilePaths)
+			Task<RecentItem?> GetRecentItemFromLink(string linkPath)
 			{
-				try
+				return Task.Run(() =>
 				{
-					using var link = new ShellLink(linkFilePath, LinkResolution.NoUIWithMsgPump, default, TimeSpan.FromMilliseconds(100));
+					try
+					{
+						using var link = new ShellLink(linkPath, LinkResolution.NoUIWithMsgPump, default, TimeSpan.FromMilliseconds(100));
 
-					if (!string.IsNullOrEmpty(link.TargetPath) && link.Target.IsFolder)
+						if (!string.IsNullOrEmpty(link.TargetPath) && link.Target.IsFolder)
+						{
+							var shellLinkItem = ShellFolderExtensions.GetShellLinkItem(link);
+							return new RecentItem(shellLinkItem);
+						}
+					}
+					catch (FileNotFoundException)
 					{
-						var shellLinkItem = ShellFolderExtensions.GetShellLinkItem(link);
-						recentItems.Add(new RecentItem(shellLinkItem));
+						// occurs when shortcut or shortcut target is deleted and accessed (link.Target)
+						// consequently, we shouldn't include the item as a recent item
 					}
-				}
-				catch (FileNotFoundException)
-				{
-					// occurs when shortcut or shortcut target is deleted and accessed (link.Target)
-					// consequently, we shouldn't include the item as a recent item
-				}
-				catch (Exception ex)
-				{
-					App.Logger.Warn(ex, ex.Message);
-				}
+					catch (Exception ex)
+					{
+						App.Logger.Warn(ex, ex.Message);
+					}
+
+					return null;
+				});
 			}
 
-			return recentItems;
+			var recentFolderTasks = linkFilePaths.Select(GetRecentItemFromLink);
+			var result = await Task.WhenAll(recentFolderTasks);
+
+			return result.OfType<RecentItem>().ToList();
 		}
 
 		/// <summary>

src/Files.App/ViewModels/SettingsViewModels/PreferencesViewModel.cs

@@ -150,50 +150,61 @@ private void AddSupportedAppLanguages()
 
 		private async Task InitStartupSettingsRecentFoldersFlyout()
 		{
+			// create Browse and Recent flyout items
 			var recentsItem = new MenuFlyoutSubItemViewModel("JumpListRecentGroupHeader".GetLocalizedResource());
 			recentsItem.Items.Add(new MenuFlyoutItemViewModel("Home".GetLocalizedResource())
 			{
 				Command = AddPageCommand,
 				CommandParameter = "Home".GetLocalizedResource(),
 				Tooltip = "Home".GetLocalizedResource()
 			});
+			await PopulateRecentItems(recentsItem);
 
-			await App.RecentItemsManager.UpdateRecentFoldersAsync();    // ensure recent folders aren't stale since we don't update them with a watcher
-			await PopulateRecentItems(recentsItem).ContinueWith(_ =>
-			{
-				AddFlyoutItemsSource = new List<IMenuFlyoutItemViewModel>() {
-					new MenuFlyoutItemViewModel("Browse".GetLocalizedResource()) { Command = AddPageCommand },
-					recentsItem,
-				}.AsReadOnly();
-			}, TaskScheduler.FromCurrentSynchronizationContext());
+			// ensure recent folders aren't stale since we don't update them with a watcher
+			// then update the items source again to actually include those items
+			await App.RecentItemsManager.UpdateRecentFoldersAsync();
+			await PopulateRecentItems(recentsItem);
 		}
 
 		private Task PopulateRecentItems(MenuFlyoutSubItemViewModel menu)
 		{
 			try
 			{
 				var recentFolders = App.RecentItemsManager.RecentFolders;
-
-				// add separator
-				if (recentFolders.Any())
+				var currentFolderMenus = menu.Items
+					.OfType<MenuFlyoutItemViewModel>()
+					.Where(m => m.Text != "Home".GetLocalizedResource())
+					.Select(m => m.Text)
+					.ToHashSet();
+
+				// add separator if we need one and one wasn't added already
+				if (recentFolders.Any() && !currentFolderMenus.Any())
 					menu.Items.Add(new MenuFlyoutSeparatorViewModel());
 
-				foreach (var recentFolder in recentFolders)
+				foreach (var folder in recentFolders)
 				{
-					var menuItem = new MenuFlyoutItemViewModel(recentFolder.Name)
+					if (currentFolderMenus.Contains(folder.Name))
+						continue;
+
+					menu.Items.Add(new MenuFlyoutItemViewModel(folder.Name)
 					{
 						Command = AddPageCommand,
-						CommandParameter = recentFolder.RecentPath,
-						Tooltip = recentFolder.RecentPath
-					};
-					menu.Items.Add(menuItem);
+						CommandParameter = folder.RecentPath,
+						Tooltip = folder.RecentPath
+					});
 				}
 			}
 			catch (Exception ex)
 			{
 				App.Logger.Info(ex, "Could not fetch recent items");
 			}
 
+			// update items source
+			AddFlyoutItemsSource = new List<IMenuFlyoutItemViewModel>() {
+				new MenuFlyoutItemViewModel("Browse".GetLocalizedResource()) { Command = AddPageCommand },
+				menu,
+			}.AsReadOnly();
+
 			return Task.CompletedTask;
 		}
 

src/Files.App/Views/SettingsPages/Preferences.xaml

@@ -137,7 +137,7 @@
 									IsOpen="False">
 									<AppBarButton Icon="Add" Label="{helpers:ResourceString Name=Add}">
 										<AppBarButton.Flyout>
-											<MenuFlyout helpers:MenuFlyoutHelper.ItemsSource="{x:Bind ViewModel.AddFlyoutItemsSource}" Placement="Bottom" />
+											<MenuFlyout helpers:MenuFlyoutHelper.ItemsSource="{x:Bind ViewModel.AddFlyoutItemsSource, Mode=OneWay}" Placement="Bottom" />
 										</AppBarButton.Flyout>
 									</AppBarButton>
 									<AppBarButton