Close some issues

Common/Extensions.cs

@@ -119,5 +119,31 @@ public static async Task<bool> IgnoreExceptions(Func<Task> action, Logger logger
                 return false;
             }
         }
+
+        public static T IgnoreExceptions<T>(Func<T> action, Logger logger = null)
+        {
+            try
+            {
+                return action();
+            }
+            catch (Exception ex)
+            {
+                logger?.Info(ex, ex.Message);
+                return default;
+            }
+        }
+
+        public static async Task<T> IgnoreExceptions<T>(Func<Task<T>> action, Logger logger = null)
+        {
+            try
+            {
+                return await action();
+            }
+            catch (Exception ex)
+            {
+                logger?.Info(ex, ex.Message);
+                return default;
+            }
+        }
     }
 }

Files/App.xaml.cs

@@ -304,6 +304,14 @@ protected override async void OnActivated(IActivatedEventArgs args)
                     {
                         async Task PerformNavigation(string payload)
                         {
+                            if (!string.IsNullOrEmpty(payload))
+                            {
+                                var folder = (StorageFolder)await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(payload).AsTask());
+                                if (folder != null && !string.IsNullOrEmpty(folder.Path))
+                                {
+                                    payload = folder.Path; // Convert short name to long name (#6190)
+                                }
+                            }
                             if (rootFrame.Content != null)
                             {
                                 await MainPageViewModel.AddNewTabByPathAsync(typeof(PaneHolderPage), payload);

Files/DataModels/NavigationControlItems/LocationItem.cs

@@ -46,10 +46,10 @@ public string Path
 
         public bool IsExpanded
         {
-            get => App.AppSettings.Get(Text == "SidebarFavorites".GetLocalized(), $"section:{Text}");
+            get => App.AppSettings.Get(Text == "SidebarFavorites".GetLocalized(), $"section:{Text.Replace('\\', '_')}");
             set
             {
-                App.AppSettings.Set(value, $"section:{Text}");
+                App.AppSettings.Set(value, $"section:{Text.Replace('\\', '_')}");
                 OnPropertyChanged(nameof(IsExpanded));
             }
         }

Files/Filesystem/Cloud/Providers/MegaCloudProvider.cs

@@ -27,8 +27,8 @@ private IList<CloudProvider> DetectFromRegistry()
             using var clsidKey = Registry.ClassesRoot.OpenSubKey(@"CLSID");
             foreach (var subKeyName in clsidKey.GetSubKeyNames())
             {
-                using var subKey = clsidKey.OpenSubKey(subKeyName);
-                if ((int?)subKey.GetValue("System.IsPinnedToNameSpaceTree") == 1)
+                using var subKey = Common.Extensions.IgnoreExceptions(() => clsidKey.OpenSubKey(subKeyName));
+                if (subKey != null && (int?)subKey.GetValue("System.IsPinnedToNameSpaceTree") == 1)
                 {
                     using var namespaceKey = Registry.CurrentUser.OpenSubKey($@"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\{subKeyName}");
                     var driveType = (string)namespaceKey?.GetValue("");

Files/Filesystem/Drives.cs

@@ -61,14 +61,11 @@ public async Task EnumerateDrivesAsync()
 
             if (await GetDrivesAsync())
             {
-                if (!Drives.Any(d => d.Type != DriveType.Removable))
+                if (!Drives.Any(d => d.Type != DriveType.Removable && d.Path == "C:\\"))
                 {
-                    // Only show consent dialog if the exception is UnauthorizedAccessException
-                    // and the drives list is empty (except for Removable drives which don't require FileSystem access)
-                    await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-                    {
-                        ShowUserConsentOnInit = true;
-                    });
+                    // Show consent dialog if the exception is UnauthorizedAccessException
+                    // and the C: drive could not be accessed
+                    ShowUserConsentOnInit = true;
                 }
             }
 

Files/Views/ColumnShellPage.xaml.cs

@@ -421,8 +421,11 @@ private async void DisplayFilesystemConsentDialog()
             if (App.DrivesManager?.ShowUserConsentOnInit ?? false)
             {
                 App.DrivesManager.ShowUserConsentOnInit = false;
-                DynamicDialog dialog = DynamicDialogFactory.GetFor_ConsentDialog();
-                await dialog.ShowAsync(ContentDialogPlacement.Popup);
+                await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
+                {
+                    DynamicDialog dialog = DynamicDialogFactory.GetFor_ConsentDialog();
+                    await dialog.ShowAsync(ContentDialogPlacement.Popup);
+                });
             }
         }
 

Files/Views/ModernShellPage.xaml.cs

@@ -455,8 +455,11 @@ private async void DisplayFilesystemConsentDialog()
             if (App.DrivesManager?.ShowUserConsentOnInit ?? false)
             {
                 App.DrivesManager.ShowUserConsentOnInit = false;
-                DynamicDialog dialog = DynamicDialogFactory.GetFor_ConsentDialog();
-                await dialog.ShowAsync(ContentDialogPlacement.Popup);
+                await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
+                {
+                    DynamicDialog dialog = DynamicDialogFactory.GetFor_ConsentDialog();
+                    await dialog.ShowAsync(ContentDialogPlacement.Popup);
+                });
             }
         }