Merge branch 'v07.1-changes' of https://github.com/duke7553/files-uwp into v07.1-changes

Author: Yair Aichenbaum

Files/App.xaml.cs

@@ -68,37 +68,9 @@ public App()
             AppCenter.Start("682666d1-51d3-4e4a-93d0-d028d43baaa0", typeof(Analytics), typeof(Crashes));
 
             AppSettings = new SettingsViewModel();
-            SetPropertiesFromLocalSettings();
             PopulatePinnedSidebarItems();
             DetectWSLDistros();
-        }
 
-        public void CloseOpenPopups()
-        {
-            var popups = VisualTreeHelper.GetOpenPopups(Window.Current);
-            foreach (var popup in popups)
-            {
-                if(popup.Child is ContentDialog)
-                {
-                    (popup.Child as ContentDialog).Hide();
-                }
-            }
-        }
-
-        public Popup GetOpenPopupByDialog(ContentDialog dialog)
-        {
-            var popups = VisualTreeHelper.GetOpenPopups(Window.Current);
-            foreach (var popup in popups)
-            {
-                if (popup.Child is ContentDialog)
-                {
-                    if((popup.Child as ContentDialog) == dialog)
-                    {
-                        return popup;
-                    }
-                }
-            }
-            return null;
         }
 
         private async void CoreWindow_KeyDown(CoreWindow sender, KeyEventArgs args)
@@ -249,15 +221,6 @@ private async void DetectWSLDistros()
                 // WSL Not Supported/Enabled
                 AppSettings.AreLinuxFilesSupported = false;
             }
-        }
-
-        private void SetPropertiesFromLocalSettings()
-        {
-
-
-
-            
-
         }
 
         public static List<string> LinesToRemoveFromFile = new List<string>();

Files/Filesystem/Drives.cs

@@ -19,7 +19,7 @@ namespace Files.Filesystem
 	public class DrivesManager
 	{
 		public ObservableCollection<DriveItem> Drives { get; } = new ObservableCollection<DriveItem>();
-
+		public bool ShowUserConsentOnInit { get; set; } = false;
 		private DeviceWatcher _deviceWatcher;
 
 		public DrivesManager()
@@ -31,8 +31,7 @@ public DrivesManager()
 			}
 			catch (AggregateException e)
 			{
-				Console.WriteLine(e);
-				new Dialogs.ConsentDialog().ShowAsync();
+				ShowUserConsentOnInit = true;
 			}
 
 			_deviceWatcher = DeviceInformation.CreateWatcher(StorageDevice.GetDeviceSelector());

Files/ProHome.xaml.cs

@@ -72,6 +72,16 @@ public ProHome()
                 Application.Current.Resources["NavigationViewExpandedPaneBackground"] = Application.Current.Resources["BackgroundAcrylicBrush"];
             }
 
+            if (App.AppSettings.DrivesManager.ShowUserConsentOnInit)
+            {
+                App.AppSettings.DrivesManager.ShowUserConsentOnInit = false;
+                DisplayFilesystemConsentDialog();
+            }
+        }
+
+        private async void DisplayFilesystemConsentDialog()
+        {
+            await App.consentDialog.ShowAsync(ContentDialogPlacement.Popup);
         }
 
         string NavParams = null;