Prevent a crash when inserting or removing flash drives

lukeblevins · lukeblevins · commit a283cbea8b7c · 2019-05-20T19:03:55.000-04:00
diff --git a/Files UWP/Filesystem/ItemViewModel.cs b/Files UWP/Filesystem/ItemViewModel.cs
@@ -38,7 +38,7 @@ public class ItemViewModel<PageType> where PageType : class
         private ObservableCollection<Classic_ListedFolderItem> _classicFolderList;
 
         private StorageFolderQueryResult _folderQueryResult;
-        private StorageFileQueryResult _fileQueryResult;
+        public StorageFileQueryResult _fileQueryResult;
         private CancellationTokenSource _cancellationTokenSource;
         private StorageFolder _rootFolder;
         private QueryOptions _options;
@@ -142,30 +142,35 @@ private void HomeItems_PropertyChanged(object sender, System.ComponentModel.Prop
         public void AddFileOrFolder(ListedItem item)
         {
             _filesAndFolders.Add(item);
-            if (typeof(PageType) == typeof(GenericFileBrowser))
+            if ((GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser) != null || (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum) != null)
             {
-                (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as  GenericFileBrowser).emptyTextGFB.Visibility = Visibility.Collapsed;
-            }
-            else if (typeof(PageType) == typeof(PhotoAlbum))
-            {
-                (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).EmptyTextPA.Visibility = Visibility.Collapsed;
+                if (typeof(PageType) == typeof(GenericFileBrowser))
+                {
+                    (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).emptyTextGFB.Visibility = Visibility.Collapsed;
+                }
+                else if (typeof(PageType) == typeof(PhotoAlbum))
+                {
+                    (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).EmptyTextPA.Visibility = Visibility.Collapsed;
+                }
             }
 
-
         }
 
         public void RemoveFileOrFolder(ListedItem item)
         {
             _filesAndFolders.Remove(item);
             if (_filesAndFolders.Count == 0)
             {
-                if (typeof(PageType) == typeof(GenericFileBrowser))
+                if ((GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser) != null || (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum) != null)
                 {
-                    (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).emptyTextGFB.Visibility = Visibility.Visible;
-                }
-                else if (typeof(PageType) == typeof(PhotoAlbum))
-                {
-                    (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).EmptyTextPA.Visibility = Visibility.Visible;
+                    if (typeof(PageType) == typeof(GenericFileBrowser))
+                    {
+                        (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).emptyTextGFB.Visibility = Visibility.Visible;
+                    }
+                    else if (typeof(PageType) == typeof(PhotoAlbum))
+                    {
+                        (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).EmptyTextPA.Visibility = Visibility.Visible;
+                    }
                 }
             }
         }
@@ -553,7 +558,7 @@ private async Task AddFile(StorageFile file, CancellationToken token)
             }
         }
 
-        private async void FileContentsChanged(IStorageQueryResultBase sender, object args)
+        public async void FileContentsChanged(IStorageQueryResultBase sender, object args)
         {
             if (_filesRefreshing)
             {
@@ -568,13 +573,16 @@ private async void FileContentsChanged(IStorageQueryResultBase sender, object ar
             await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal,
             () =>
             {
-                if (typeof(PageType) == typeof(GenericFileBrowser))
+                if((GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser) != null || (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum) != null)
                 {
-                    (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).progressBar.Visibility = Visibility.Visible;
-                }
-                else if (typeof(PageType) == typeof(PhotoAlbum))
-                {
-                    (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).progressBar.Visibility = Visibility.Visible;
+                    if (typeof(PageType) == typeof(GenericFileBrowser))
+                    {
+                        (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).progressBar.Visibility = Visibility.Visible;
+                    }
+                    else if (typeof(PageType) == typeof(PhotoAlbum))
+                    {
+                        (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).progressBar.Visibility = Visibility.Visible;
+                    }
                 }
             });
             _filesRefreshing = true;
@@ -631,13 +639,16 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
             await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal,
             () =>
             {
-                if (typeof(PageType) == typeof(GenericFileBrowser))
-                {
-                    (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).progressBar.Visibility = Visibility.Collapsed;
-                }
-                else if (typeof(PageType) == typeof(PhotoAlbum))
+                if ((GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser) != null || (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum) != null)
                 {
-                    (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).progressBar.Visibility = Visibility.Collapsed;
+                    if (typeof(PageType) == typeof(GenericFileBrowser))
+                    {
+                        (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).progressBar.Visibility = Visibility.Collapsed;
+                    }
+                    else if (typeof(PageType) == typeof(PhotoAlbum))
+                    {
+                        (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).progressBar.Visibility = Visibility.Collapsed;
+                    }
                 }
             });
 
diff --git a/Files UWP/GenericFileBrowser.xaml.cs b/Files UWP/GenericFileBrowser.xaml.cs
@@ -154,7 +154,11 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
             }
         }
 
-
+        protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+        {
+            base.OnNavigatingFrom(e);
+            instanceViewModel._fileQueryResult.ContentsChanged -= instanceViewModel.FileContentsChanged;
+        }
 
 
         private void AllView_DragOver(object sender, DragEventArgs e)
diff --git a/Files UWP/Interacts/Interaction.cs b/Files UWP/Interacts/Interaction.cs
@@ -50,6 +50,7 @@ public async void List_ItemClick(object sender, DoubleTappedRoutedEventArgs e)
                     {
                         // Add location to MRU List
                         mostRecentlyUsed.Add(await StorageFolder.GetFolderFromPathAsync(clickedOnItem.FilePath));
+
                         var TabInstance = CurrentInstance;
                         (type as GenericFileBrowser).instanceViewModel.Universal.path = clickedOnItem.FilePath;
                         TabInstance.PathText.Text = clickedOnItem.FilePath;
@@ -101,7 +102,10 @@ public async void List_ItemClick(object sender, DoubleTappedRoutedEventArgs e)
                         }
                         else
                         {
-                            TabInstance.drivesList.SelectedIndex = 0;
+                            if (clickedOnItem.FilePath.Split(@"\")[0].Contains("C:"))
+                            {
+                                TabInstance.drivesList.SelectedIndex = 0;
+                            }
                             (type as GenericFileBrowser).instanceViewModel.Universal.path = clickedOnItem.FilePath;
                             TabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), (type as GenericFileBrowser).instanceViewModel.Universal.path, new SuppressNavigationTransitionInfo());
                         }
diff --git a/Files UWP/PhotoAlbum.xaml.cs b/Files UWP/PhotoAlbum.xaml.cs
@@ -113,6 +113,12 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
             }
         }
 
+        protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+        {
+            base.OnNavigatingFrom(e);
+            instanceViewModel._fileQueryResult.ContentsChanged -= instanceViewModel.FileContentsChanged;
+        }
+
         private void Clipboard_ContentChanged(object sender, object e)
         {
             try
diff --git a/Files UWP/ProHome.xaml.cs b/Files UWP/ProHome.xaml.cs
@@ -785,7 +785,7 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
 
         private void ItemDisplayFrame_Navigating(object sender, Windows.UI.Xaml.Navigation.NavigatingCancelEventArgs e)
         {
-            
+
         }
 
         private void ItemDisplayFrame_Navigated(object sender, Windows.UI.Xaml.Navigation.NavigationEventArgs e)
diff --git a/Files UWP/YourHome.xaml.cs b/Files UWP/YourHome.xaml.cs
@@ -13,6 +13,8 @@
 using System.ComponentModel;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using System.IO;
+using Windows.UI.Popups;
 
 namespace Files
 {
@@ -250,7 +252,29 @@ private async void RecentsView_ItemClick(object sender, ItemClickEventArgs e)
             }
             catch (System.ArgumentException)
             {
-                GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), path);
+                if (new DirectoryInfo(path).Root.ToString().Contains(@"C:\"))
+                {
+                    GetCurrentSelectedTabInstance<ProHome>().drivesList.SelectedIndex = 0;
+                    GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), path);
+                }
+                else
+                {
+                    foreach(ListViewItem drive in GetCurrentSelectedTabInstance<ProHome>().drivesList.Items)
+                    {
+                        if (drive.Tag.ToString() == new DirectoryInfo(path).Root.ToString())
+                        {
+                            GetCurrentSelectedTabInstance<ProHome>().drivesList.SelectedItem = null;
+                            drive.IsSelected = true;
+                            GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Navigate(typeof(GenericFileBrowser), path);
+                            return;
+                        }
+                    }
+                }
+            }
+            catch (COMException)
+            {
+                MessageDialog dialog = new MessageDialog("Please insert the necessary drive to access this item.", "Drive Unplugged");
+                await dialog.ShowAsync();
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public class ItemViewModel<PageType> where PageType : class`
`38`	`38`	`private ObservableCollection<Classic_ListedFolderItem> _classicFolderList;`
`39`	`39`
`40`	`40`	`private StorageFolderQueryResult _folderQueryResult;`
`41`		`- private StorageFileQueryResult _fileQueryResult;`
	`41`	`+ public StorageFileQueryResult _fileQueryResult;`
`42`	`42`	`private CancellationTokenSource _cancellationTokenSource;`
`43`	`43`	`private StorageFolder _rootFolder;`
`44`	`44`	`private QueryOptions _options;`
`@@ -142,30 +142,35 @@ private void HomeItems_PropertyChanged(object sender, System.ComponentModel.Prop`
`142`	`142`	`public void AddFileOrFolder(ListedItem item)`
`143`	`143`	`{`
`144`	`144`	`_filesAndFolders.Add(item);`
`145`		`- if (typeof(PageType) == typeof(GenericFileBrowser))`
	`145`	`+ if ((GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser) != null \|\| (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum) != null)`
`146`	`146`	`{`
`147`		`- (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).emptyTextGFB.Visibility = Visibility.Collapsed;`
`148`		`- }`
`149`		`- else if (typeof(PageType) == typeof(PhotoAlbum))`
`150`		`- {`
`151`		`- (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).EmptyTextPA.Visibility = Visibility.Collapsed;`
	`147`	`+ if (typeof(PageType) == typeof(GenericFileBrowser))`
	`148`	`+ {`
	`149`	`+ (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).emptyTextGFB.Visibility = Visibility.Collapsed;`
	`150`	`+ }`
	`151`	`+ else if (typeof(PageType) == typeof(PhotoAlbum))`
	`152`	`+ {`
	`153`	`+ (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).EmptyTextPA.Visibility = Visibility.Collapsed;`
	`154`	`+ }`
`152`	`155`	`}`
`153`	`156`
`154`		`-`
`155`	`157`	`}`
`156`	`158`
`157`	`159`	`public void RemoveFileOrFolder(ListedItem item)`
`158`	`160`	`{`
`159`	`161`	`_filesAndFolders.Remove(item);`
`160`	`162`	`if (_filesAndFolders.Count == 0)`
`161`	`163`	`{`
`162`		`- if (typeof(PageType) == typeof(GenericFileBrowser))`
	`164`	`+ if ((GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser) != null \|\| (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum) != null)`
`163`	`165`	`{`
`164`		`- (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).emptyTextGFB.Visibility = Visibility.Visible;`
`165`		`- }`
`166`		`- else if (typeof(PageType) == typeof(PhotoAlbum))`
`167`		`- {`
`168`		`- (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).EmptyTextPA.Visibility = Visibility.Visible;`
	`166`	`+ if (typeof(PageType) == typeof(GenericFileBrowser))`
	`167`	`+ {`
	`168`	`+ (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).emptyTextGFB.Visibility = Visibility.Visible;`
	`169`	`+ }`
	`170`	`+ else if (typeof(PageType) == typeof(PhotoAlbum))`
	`171`	`+ {`
	`172`	`+ (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).EmptyTextPA.Visibility = Visibility.Visible;`
	`173`	`+ }`
`169`	`174`	`}`
`170`	`175`	`}`
`171`	`176`	`}`
`@@ -553,7 +558,7 @@ private async Task AddFile(StorageFile file, CancellationToken token)`
`553`	`558`	`}`
`554`	`559`	`}`
`555`	`560`
`556`		`- private async void FileContentsChanged(IStorageQueryResultBase sender, object args)`
	`561`	`+ public async void FileContentsChanged(IStorageQueryResultBase sender, object args)`
`557`	`562`	`{`
`558`	`563`	`if (_filesRefreshing)`
`559`	`564`	`{`
`@@ -568,13 +573,16 @@ private async void FileContentsChanged(IStorageQueryResultBase sender, object ar`
`568`	`573`	`await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal,`
`569`	`574`	`() =>`
`570`	`575`	`{`
`571`		`- if (typeof(PageType) == typeof(GenericFileBrowser))`
	`576`	`+ if((GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser) != null \|\| (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum) != null)`
`572`	`577`	`{`
`573`		`- (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).progressBar.Visibility = Visibility.Visible;`
`574`		`- }`
`575`		`- else if (typeof(PageType) == typeof(PhotoAlbum))`
`576`		`- {`
`577`		`- (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).progressBar.Visibility = Visibility.Visible;`
	`578`	`+ if (typeof(PageType) == typeof(GenericFileBrowser))`
	`579`	`+ {`
	`580`	`+ (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).progressBar.Visibility = Visibility.Visible;`
	`581`	`+ }`
	`582`	`+ else if (typeof(PageType) == typeof(PhotoAlbum))`
	`583`	`+ {`
	`584`	`+ (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).progressBar.Visibility = Visibility.Visible;`
	`585`	`+ }`
`578`	`586`	`}`
`579`	`587`	`});`
`580`	`588`	`_filesRefreshing = true;`
`@@ -631,13 +639,16 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio`
`631`	`639`	`await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal,`
`632`	`640`	`() =>`
`633`	`641`	`{`
`634`		`- if (typeof(PageType) == typeof(GenericFileBrowser))`
`635`		`- {`
`636`		`- (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).progressBar.Visibility = Visibility.Collapsed;`
`637`		`- }`
`638`		`- else if (typeof(PageType) == typeof(PhotoAlbum))`
	`642`	`+ if ((GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser) != null \|\| (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum) != null)`
`639`	`643`	`{`
`640`		`- (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).progressBar.Visibility = Visibility.Collapsed;`
	`644`	`+ if (typeof(PageType) == typeof(GenericFileBrowser))`
	`645`	`+ {`
	`646`	`+ (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).progressBar.Visibility = Visibility.Collapsed;`
	`647`	`+ }`
	`648`	`+ else if (typeof(PageType) == typeof(PhotoAlbum))`
	`649`	`+ {`
	`650`	`+ (GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).progressBar.Visibility = Visibility.Collapsed;`
	`651`	`+ }`
`641`	`652`	`}`
`642`	`653`	`});`
`643`	`654`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,11 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`157`		`-`
	`157`	`+ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)`
	`158`	`+ {`
	`159`	`+ base.OnNavigatingFrom(e);`
	`160`	`+ instanceViewModel._fileQueryResult.ContentsChanged -= instanceViewModel.FileContentsChanged;`
	`161`	`+ }`
`158`	`162`
`159`	`163`
`160`	`164`	`private void AllView_DragOver(object sender, DragEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ public async void List_ItemClick(object sender, DoubleTappedRoutedEventArgs e)`
`50`	`50`	`{`
`51`	`51`	`// Add location to MRU List`
`52`	`52`	`mostRecentlyUsed.Add(await StorageFolder.GetFolderFromPathAsync(clickedOnItem.FilePath));`
	`53`	`+`
`53`	`54`	`var TabInstance = CurrentInstance;`
`54`	`55`	`(type as GenericFileBrowser).instanceViewModel.Universal.path = clickedOnItem.FilePath;`
`55`	`56`	`TabInstance.PathText.Text = clickedOnItem.FilePath;`
`@@ -101,7 +102,10 @@ public async void List_ItemClick(object sender, DoubleTappedRoutedEventArgs e)`
`101`	`102`	`}`
`102`	`103`	`else`
`103`	`104`	`{`
`104`		`- TabInstance.drivesList.SelectedIndex = 0;`
	`105`	`+ if (clickedOnItem.FilePath.Split(@"\")[0].Contains("C:"))`
	`106`	`+ {`
	`107`	`+ TabInstance.drivesList.SelectedIndex = 0;`
	`108`	`+ }`
`105`	`109`	`(type as GenericFileBrowser).instanceViewModel.Universal.path = clickedOnItem.FilePath;`
`106`	`110`	`TabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), (type as GenericFileBrowser).instanceViewModel.Universal.path, new SuppressNavigationTransitionInfo());`
`107`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,12 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
	`116`	`+ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)`
	`117`	`+ {`
	`118`	`+ base.OnNavigatingFrom(e);`
	`119`	`+ instanceViewModel._fileQueryResult.ContentsChanged -= instanceViewModel.FileContentsChanged;`
	`120`	`+ }`
	`121`	`+`
`116`	`122`	`private void Clipboard_ContentChanged(object sender, object e)`
`117`	`123`	`{`
`118`	`124`	`try`
Original file line number	Diff line number	Diff line change
`@@ -785,7 +785,7 @@ private void Page_Loaded(object sender, RoutedEventArgs e)`
`785`	`785`
`786`	`786`	`private void ItemDisplayFrame_Navigating(object sender, Windows.UI.Xaml.Navigation.NavigatingCancelEventArgs e)`
`787`	`787`	`{`
`788`		`-`
	`788`	`+`
`789`	`789`	`}`
`790`	`790`
`791`	`791`	`private void ItemDisplayFrame_Navigated(object sender, Windows.UI.Xaml.Navigation.NavigationEventArgs e)`