Merge branch 'develop' of https://github.com/duke7553/files-uwp into develop

Author: Yair Aichenbaum

Files/Filesystem/ItemViewModel.cs

@@ -545,29 +545,57 @@ public async void LoadExtendedItemProperties(ListedItem item)
                 {
                     BitmapImage icon = new BitmapImage();
                     var matchingItem = _filesAndFolders.FirstOrDefault(x => x == item);
-                    var matchingStorageItem = await StorageFile.GetFileFromPathAsync(item.FilePath);
-                    if (matchingItem != null && matchingStorageItem != null)
+                    try
                     {
-                        matchingItem.FileType = matchingStorageItem.DisplayType;
-                        matchingItem.FolderRelativeId = matchingStorageItem.FolderRelativeId;
-                        var Thumbnail = await matchingStorageItem.GetThumbnailAsync(ThumbnailMode.ListView, 20, ThumbnailOptions.UseCurrentScale);
-                        if (Thumbnail != null)
+                        var matchingStorageItem = await StorageFile.GetFileFromPathAsync(item.FilePath);
+                        if (matchingItem != null && matchingStorageItem != null)
                         {
-                            matchingItem.FileImg = icon;
-                            await icon.SetSourceAsync(Thumbnail);
-                            matchingItem.EmptyImgVis = Visibility.Collapsed;
-                            matchingItem.FileIconVis = Visibility.Visible;
+                            matchingItem.FileType = matchingStorageItem.DisplayType;
+                            matchingItem.FolderRelativeId = matchingStorageItem.FolderRelativeId;
+                            var Thumbnail = await matchingStorageItem.GetThumbnailAsync(ThumbnailMode.ListView, 20, ThumbnailOptions.UseCurrentScale);
+                            if (Thumbnail != null)
+                            {
+                                matchingItem.FileImg = icon;
+                                await icon.SetSourceAsync(Thumbnail);
+                                matchingItem.EmptyImgVis = Visibility.Collapsed;
+                                matchingItem.FileIconVis = Visibility.Visible;
+                            }
                         }
                     }
+                    catch (UnauthorizedAccessException)
+                    {
+                        await App.consentDialog.ShowAsync();
+                        return;
+                    }
+                    catch (FileNotFoundException)
+                    {
+                        item.ItemPropertiesInitialized = true;
+                        return;
+                    }
+                    
                 }
                 else
                 {
                     var matchingItem = _filesAndFolders.FirstOrDefault(x => x == item);
-                    var matchingStorageItem = await StorageFolder.GetFolderFromPathAsync(item.FilePath);
-                    if (matchingItem != null && matchingStorageItem != null)
+                    try
                     {
-                        matchingItem.FolderRelativeId = matchingStorageItem.FolderRelativeId;
+                        var matchingStorageItem = await StorageFolder.GetFolderFromPathAsync(item.FilePath);
+                        if (matchingItem != null && matchingStorageItem != null)
+                        {
+                            matchingItem.FolderRelativeId = matchingStorageItem.FolderRelativeId;
+                        }
                     }
+                    catch (UnauthorizedAccessException)
+                    {
+                        await App.consentDialog.ShowAsync();
+                        return;
+                    }
+                    catch (FileNotFoundException)
+                    {
+                        item.ItemPropertiesInitialized = true;
+                        return;
+                    }
+                    
                 }
 
                 item.ItemPropertiesInitialized = true;
@@ -630,6 +658,7 @@ public async void RapidAddItemsToCollectionAsync(string path)
                 catch (UnauthorizedAccessException)
                 {
                     await App.consentDialog.ShowAsync();
+                    return;
                 }
                 catch (COMException e)
                 {

Files/UserControls/YourHome.xaml.cs

@@ -268,14 +268,25 @@ public async void PopulateRecentsList()
             Visibility ItemFolderImgVis;
             Visibility ItemEmptyImgVis;
             Visibility ItemFileIconVis;
-            if (mostRecentlyUsed.Entries.Count == 0)
+            bool IsRecentsListEmpty = true;
+            foreach(var entry in mostRecentlyUsed.Entries)
+            {
+                var item = await mostRecentlyUsed.GetItemAsync(entry.Token);
+                if (item.IsOfType(StorageItemTypes.File))
+                {
+                    IsRecentsListEmpty = false;
+                }
+            }
+
+            if (IsRecentsListEmpty)
             {
                 Empty.Visibility = Visibility.Visible;
             }
             else
             {
                 Empty.Visibility = Visibility.Collapsed;
             }
+
             foreach (Windows.Storage.AccessCache.AccessListEntry entry in mostRecentlyUsed.Entries)
             {
                 string mruToken = entry.Token;
@@ -313,6 +324,11 @@ public async void PopulateRecentsList()
                     // Skip item until consent is provided
                 }
             }
+
+            if(recentItemsCollection.Count == 0)
+            {
+                Empty.Visibility = Visibility.Visible;
+            }
         }
 
         private async void RecentsView_ItemClick(object sender, ItemClickEventArgs e)

Files/Views/Pages/ProHome.xaml.cs

@@ -313,9 +313,6 @@ private async void ProHomeInstance_KeyUp(object sender, KeyRoutedEventArgs e)
                 case (false, false, false, true, VirtualKey.Delete): //delete, delete item
                     App.CurrentInstance.InteractionOperations.DeleteItem_Click(null, null);
                     break;
-                case (false, false, false, true, VirtualKey.Enter): //enter, open item
-                    App.CurrentInstance.InteractionOperations.List_ItemClick(null, null);
-                    break;
                 case (false, false, false, true, VirtualKey.Space): //space, quick look
                     if ((App.CurrentInstance.ContentPage).IsQuickLookEnabled)
                     {