Fixed issues found in AppCenter (#2663)

Author: gave92

Files/Filesystem/FilesystemOperations/FilesystemOperations.cs

@@ -380,16 +380,19 @@ await associatedInstance.FilesystemViewModel.GetFileFromPathAsync(iFilePath)
                 {
                     // Enumerate Recycle Bin
                     List<ShellFileItem> items = await recycleBinHelpers.EnumerateRecycleBin();
-                    List<ShellFileItem> nameMatchItems;
+                    List<ShellFileItem> nameMatchItems = new List<ShellFileItem>();
 
                     // Get name matching files
-                    if (Path.GetExtension(source.Path) == ".lnk" || Path.GetExtension(source.Path) == ".url") // We need to check if it is a shortcut file
+                    if (items != null)
                     {
-                        nameMatchItems = items.Where((item) => item.FilePath == Path.Combine(Path.GetDirectoryName(source.Path), Path.GetFileNameWithoutExtension(source.Path))).ToList();
-                    }
-                    else
-                    {
-                        nameMatchItems = items.Where((item) => item.FilePath == source.Path).ToList();
+                        if (Path.GetExtension(source.Path) == ".lnk" || Path.GetExtension(source.Path) == ".url") // We need to check if it is a shortcut file
+                        {
+                            nameMatchItems = items.Where((item) => item.FilePath == Path.Combine(Path.GetDirectoryName(source.Path), Path.GetFileNameWithoutExtension(source.Path))).ToList();
+                        }
+                        else
+                        {
+                            nameMatchItems = items.Where((item) => item.FilePath == source.Path).ToList();
+                        }
                     }
 
                     // Get newest file

Files/Helpers/JumpListManager.cs

@@ -95,11 +95,17 @@ private Task AddFolder(string path)
 
         public async void RemoveFolder(string path)
         {
-            if (JumpListItemPaths.Contains(path))
+            // Updating the jumplist may fail randomly with error: FileLoadException: File in use
+            // In that case app should just catch the error and proceed as usual
+            try
             {
-                JumpListItemPaths.Remove(path);
-                await UpdateAsync();
+                if (JumpListItemPaths.Contains(path))
+                {
+                    JumpListItemPaths.Remove(path);
+                    await UpdateAsync();
+                }
             }
+            catch { }
         }
 
         private async Task UpdateAsync()

Files/Helpers/RegistryHelper.cs

@@ -100,7 +100,7 @@ private static async Task<ShellNewEntry> ParseShellNewRegistryEntry(RegistryKey
                 .OnSuccess(t => t.CreateFileAsync("file" + extension, CreationCollisionOption.OpenIfExists).AsTask());
 
             var displayType = sampleFile ? sampleFile.Result.DisplayType : string.Format("{0} {1}", "file", extension);
-            var thumbnail = sampleFile ? await sampleFile.Result.GetThumbnailAsync(Windows.Storage.FileProperties.ThumbnailMode.ListView, 24, Windows.Storage.FileProperties.ThumbnailOptions.UseCurrentScale) : null;
+            var thumbnail = sampleFile ? await FilesystemTasks.Wrap(() => sampleFile.Result.GetThumbnailAsync(Windows.Storage.FileProperties.ThumbnailMode.ListView, 24, Windows.Storage.FileProperties.ThumbnailOptions.UseCurrentScale).AsTask()) : null;
 
             var entry = new ShellNewEntry()
             {

Files/View Models/ItemViewModel.cs

@@ -848,6 +848,10 @@ public async void RapidAddItemsToCollectionAsync(string path, string previousDir
                     }
                 }
             }
+            catch (ObjectDisposedException ex)
+            {
+                NLog.LogManager.GetCurrentClassLogger().Warn(ex, ex.Message);
+            }
             finally
             {
                 semaphoreSlim.Release();
@@ -1169,7 +1173,11 @@ private async Task EnumFromStorageFolderAsync()
                         break;
                     }
                 }
-                catch (UnauthorizedAccessException)
+                catch (NotImplementedException)
+                {
+                    break;
+                }
+                catch (Exception ex) when (ex is UnauthorizedAccessException || ex is FileNotFoundException)
                 {
                     ++count;
                     continue;

Files/View Models/SelectedItemsPropertiesViewModel.cs

@@ -540,7 +540,7 @@ public async void CheckFileExtension()
             IsSelectedItemShortcut = false;
 
             //check if the selected item is an image file
-            string ItemExtension = await CoreApplication.MainView.ExecuteOnUIThreadAsync(() => contentPage.SelectedItem.FileExtension);
+            string ItemExtension = await CoreApplication.MainView.ExecuteOnUIThreadAsync(() => contentPage?.SelectedItem?.FileExtension);
             if (!string.IsNullOrEmpty(ItemExtension) && SelectedItemsCount == 1)
             {
                 if (ItemExtension.Equals(".png", StringComparison.OrdinalIgnoreCase)

Files/Views/ModernShellPage.xaml.cs

@@ -211,21 +211,21 @@ private void ModernShellPage_BackNavRequested(object sender, EventArgs e)
 
         private async void SidebarControl_RecycleBinItemRightTapped(object sender, EventArgs e)
         {
-            var value = new ValueSet
+            var recycleBinHasItems = false;
+            if (ServiceConnection != null)
+            {
+                var value = new ValueSet
                 {
                     { "Arguments", "RecycleBin" },
                     { "action", "Query" }
                 };
-
-            var response = await ServiceConnection.SendMessageAsync(value);
-            if (response.Status == AppServiceResponseStatus.Success && response.Message.TryGetValue("NumItems", out var numItems))
-            {
-                SidebarControl.RecycleBinHasItems = (long)numItems > 0;
-            }
-            else
-            {
-                SidebarControl.RecycleBinHasItems = false;
+                var response = await ServiceConnection.SendMessageAsync(value);
+                if (response.Status == AppServiceResponseStatus.Success && response.Message.TryGetValue("NumItems", out var numItems))
+                {
+                    recycleBinHasItems = (long)numItems > 0;
+                }
             }
+            SidebarControl.RecycleBinHasItems = recycleBinHasItems;
         }
 
         private async void SidebarControl_SidebarItemDropped(object sender, Controls.SidebarItemDroppedEventArgs e)
@@ -1146,16 +1146,11 @@ public void Up_Click()
             Frame instanceContentFrame = ContentFrame;
             FilesystemViewModel.CancelLoadAndClearFiles();
             var instance = FilesystemViewModel;
-            string parentDirectoryOfPath;
-            // Check that there isn't a slash at the end
-            if ((instance.WorkingDirectory.Count() - 1) - instance.WorkingDirectory.LastIndexOf("\\") > 0)
-            {
-                parentDirectoryOfPath = instance.WorkingDirectory.Remove(instance.WorkingDirectory.LastIndexOf("\\"));
-            }
-            else  // Slash found at end
+            string parentDirectoryOfPath = instance.WorkingDirectory.TrimEnd('\\');
+            var lastSlashIndex = parentDirectoryOfPath.LastIndexOf("\\");
+            if (lastSlashIndex != -1)
             {
-                var currentPathWithoutEndingSlash = instance.WorkingDirectory.Remove(instance.WorkingDirectory.LastIndexOf("\\"));
-                parentDirectoryOfPath = currentPathWithoutEndingSlash.Remove(currentPathWithoutEndingSlash.LastIndexOf("\\"));
+                parentDirectoryOfPath = instance.WorkingDirectory.Remove(lastSlashIndex);
             }
 
             SelectSidebarItemFromPath();

Files/Views/Pages/Properties.xaml.cs

@@ -36,7 +36,6 @@ public sealed partial class Properties : Page
         public Properties()
         {
             InitializeComponent();
-            propertiesDialog = Interaction.FindParent<ContentDialog>(this);
         }
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
@@ -67,6 +66,7 @@ private async void Properties_Loaded(object sender, RoutedEventArgs e)
             }
             else
             {
+                propertiesDialog = Interaction.FindParent<ContentDialog>(this);
                 propertiesDialog.Closed += PropertiesDialog_Closed;
             }
         }
@@ -194,7 +194,7 @@ private async void OKButton_Click(object sender, RoutedEventArgs e)
             }
             else
             {
-                propertiesDialog.Hide();
+                propertiesDialog?.Hide();
             }
         }
 
@@ -206,7 +206,7 @@ private async void CancelButton_Click(object sender, RoutedEventArgs e)
             }
             else
             {
-                propertiesDialog.Hide();
+                propertiesDialog?.Hide();
             }
         }
 
@@ -220,7 +220,7 @@ private async void Page_KeyDown(object sender, KeyRoutedEventArgs e)
                 }
                 else
                 {
-                    propertiesDialog.Hide();
+                    propertiesDialog?.Hide();
                 }
             }
         }

Files/Views/SettingsPages/About.xaml.cs

@@ -36,8 +36,10 @@ private async void FeedbackListView_Tapped(object sender, Windows.UI.Xaml.Input.
             {
                 await Launcher.LaunchUriAsync(new Uri(@"https://paypal.me/yaichenbaum"));
             }
-
-            (FeedbackListView.Items[FeedbackListView.SelectedIndex] as ListViewItem).IsSelected = false;
+            if (FeedbackListView.SelectedIndex != -1)
+            {
+                (FeedbackListView.Items[FeedbackListView.SelectedIndex] as ListViewItem).IsSelected = false;
+            }
         }
     }
 }