Improve drive detection and UI sync to deal with duplicate entries

Files.Launcher/Files.Launcher.csproj

@@ -111,9 +111,6 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Management" />
@@ -126,9 +123,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="Windows">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.18362.0\Windows.winmd</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DeviceWatcher.cs" />

Files.Launcher/Program.cs

@@ -233,9 +233,13 @@ private static async Task ParseArgumentsAsync(AppServiceRequestReceivedEventArgs
                     await ParseRecycleBinActionAsync(args, binAction);
                     break;
 
-                case "StartupTasks":
+                case "DetectQuickLook":
                     // Check QuickLook Availability
-                    QuickLook.CheckQuickLookAvailability(localSettings);
+                    var available = QuickLook.CheckQuickLookAvailability();
+                    await args.Request.SendResponseAsync(new ValueSet()
+                    {
+                        { "IsAvailable", available }
+                    });
                     break;
 
                 case "ToggleQuickLook":
@@ -326,8 +330,10 @@ await args.Request.SendResponseAsync(new ValueSet()
                     break;
 
                 case "GetOneDriveAccounts":
-                    using (var oneDriveAccountsKey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\OneDrive\Accounts", false))
+                    try
                     {
+                        var oneDriveAccountsKey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\OneDrive\Accounts", false);
+
                         if (oneDriveAccountsKey == null)
                         {
                             await args.Request.SendResponseAsync(new ValueSet());
@@ -348,6 +354,10 @@ await args.Request.SendResponseAsync(new ValueSet()
                         }
                         await args.Request.SendResponseAsync(oneDriveAccounts);
                     }
+                    catch
+                    {
+                        await args.Request.SendResponseAsync(new ValueSet());
+                    }
                     break;
 
                 default:
@@ -798,12 +808,6 @@ private static bool HandleCommandLineArgs()
 
                     return true;
                 }
-                else if (arguments == "StartupTasks")
-                {
-                    // Check QuickLook Availability
-                    QuickLook.CheckQuickLookAvailability(localSettings);
-                    return true;
-                }
             }
             return false;
         }

Files.Launcher/QuickLook.cs

@@ -3,7 +3,6 @@
 using System.IO;
 using System.IO.Pipes;
 using System.Security.Principal;
-using Windows.Storage;
 
 namespace FilesFullTrust
 {
@@ -30,7 +29,7 @@ public static void ToggleQuickLook(string path)
             }
         }
 
-        public static void CheckQuickLookAvailability(ApplicationDataContainer localSettings)
+        public static bool CheckQuickLookAvailability()
         {
             static int QuickLookServerAvailable()
             {
@@ -51,7 +50,7 @@ static int QuickLookServerAvailable()
 
                     return serverInstances;
                 }
-                catch (TimeoutException e)
+                catch (TimeoutException)
                 {
                     client.Close();
                     return 0;
@@ -61,14 +60,13 @@ static int QuickLookServerAvailable()
             try
             {
                 var result = QuickLookServerAvailable();
-
                 Logger.Info($"QuickLook detected: {result != 0}");
-                localSettings.Values["quicklook_enabled"] = result != 0;
+                return result != 0;
             }
             catch (Exception ex)
             {
                 Logger.Info(ex, ex.Message);
-                localSettings.Values["quicklook_enabled"] = 0;
+                return false;
             }
         }
     }

Files/App.xaml.cs

@@ -46,12 +46,12 @@ sealed partial class App : Application
 
         public static IBundlesSettings BundlesSettings = new BundlesSettingsViewModel();
 
-        public static SettingsViewModel AppSettings { get; set; }
-        public static InteractionViewModel InteractionViewModel { get; set; }
+        public static SettingsViewModel AppSettings { get; private set; }
+        public static InteractionViewModel InteractionViewModel { get; private set; }
         public static JumpListManager JumpList { get; } = new JumpListManager();
-        public static SidebarPinnedController SidebarPinnedController { get; set; }
-        public static CloudDrivesManager CloudDrivesManager { get; set; }
-        public static DrivesManager DrivesManager { get; set; }
+        public static SidebarPinnedController SidebarPinnedController { get; private set; }
+        public static CloudDrivesManager CloudDrivesManager { get; private set; }
+        public static DrivesManager DrivesManager { get; private set; }
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
@@ -79,7 +79,7 @@ public App()
             StartAppCenter();
         }
 
-        internal static async Task EnsureSettingsAndConfigurationAreBootstrapped()
+        private static async Task EnsureSettingsAndConfigurationAreBootstrapped()
         {
             if (AppSettings == null)
             {
@@ -91,38 +91,17 @@ internal static async Task EnsureSettingsAndConfigurationAreBootstrapped()
                 }
             }
 
-            if (CloudDrivesManager == null)
-            {
-                //Enumerate cloud drives on in the background. It will update the UI itself when finished
-                _ = Files.Filesystem.CloudDrivesManager.Instance.ContinueWith(o =>
-                  {
-                      CloudDrivesManager = o.Result;
-                  });
-            }
+            InteractionViewModel ??= new InteractionViewModel();
+            SidebarPinnedController ??= await SidebarPinnedController.CreateInstance();
+            DrivesManager ??= new DrivesManager();
+            CloudDrivesManager ??= new CloudDrivesManager();
 
-            //Start off a list of tasks we need to run before we can continue startup
-            var tasksToRun = new List<Task>();
-
-            if (SidebarPinnedController == null)
+            // Start off a list of tasks we need to run before we can continue startup
+            _ = Task.Factory.StartNew(async () =>
             {
-                tasksToRun.Add(Files.Controllers.SidebarPinnedController.CreateInstance().ContinueWith(o => SidebarPinnedController = o.Result));
-            }
-
-            if (DrivesManager == null)
-            {
-                tasksToRun.Add(Files.Filesystem.DrivesManager.Instance.ContinueWith(o => DrivesManager = o.Result));
-            }
-
-            if (InteractionViewModel == null)
-            {
-                InteractionViewModel = new InteractionViewModel();
-            }
-
-            if (tasksToRun.Any())
-            {
-                //Only proceed when all tasks are completed
-                await Task.WhenAll(tasksToRun);
-            }
+                await DrivesManager.EnumerateDrivesAsync();
+                await CloudDrivesManager.EnumerateDrivesAsync();
+            });
         }
 
         private async void StartAppCenter()

Files/Controllers/SidebarPinnedController.cs

@@ -84,7 +84,7 @@ private async Task LoadAsync()
                 Model.Save();
             }
 
-            Model.AddAllItemsToSidebar();
+            await Model.AddAllItemsToSidebar();
         }
 
         public void SaveModel()

Files/DataModels/SidebarPinnedModel.cs

@@ -3,12 +3,15 @@
 using Files.ViewModels;
 using Files.Views;
 using Newtonsoft.Json;
+using NLog;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Windows.ApplicationModel.Core;
+using Windows.UI.Core;
 using Windows.UI.Xaml.Media;
 
 namespace Files.DataModels
@@ -148,7 +151,7 @@ ex is ArgumentException // Pinned item was invalid
                 Debug.WriteLine($"An error occured while swapping pinned items in the navigation sidebar. {ex.Message}");
                 this.Items = sidebarItemsBackup;
                 this.RemoveStaleSidebarItems();
-                this.AddAllItemsToSidebar();
+                _ = this.AddAllItemsToSidebar();
             }
         }
 
@@ -215,12 +218,21 @@ public async Task AddItemToSidebarAsync(string path)
         /// <summary>
         /// Adds all items to the navigation sidebar
         /// </summary>
-        public async void AddAllItemsToSidebar()
+        public async Task AddAllItemsToSidebar()
         {
-            for (int i = 0; i < Items.Count(); i++)
+            await MainPage.SideBarItemsSemaphore.WaitAsync();
+            try
+            {
+                for (int i = 0; i < Items.Count(); i++)
+                {
+                    string path = Items[i];
+                    await AddItemToSidebarAsync(path);
+                }
+                MainPage.SideBarItems.EndBulkOperation();
+            }
+            finally
             {
-                string path = Items[i];
-                await AddItemToSidebarAsync(path);
+                MainPage.SideBarItemsSemaphore.Release();
             }
         }
 

Files/Files.csproj

@@ -198,6 +198,7 @@
       <DependentUpon>RestartDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Helpers\BitmapHelper.cs" />
+    <Compile Include="Helpers\CollectionDebugView.cs" />
     <Compile Include="Helpers\DynamicDialogFactory.cs" />
     <Compile Include="Helpers\Extension.cs" />
     <Compile Include="Helpers\FileListCache\CacheEntry.cs" />

Files/Filesystem/Cloud/CloudProviderController.cs

@@ -7,26 +7,18 @@ namespace Files.Filesystem.Cloud
 {
     public class CloudProviderController
     {
-        private List<CloudProvider> cloudProviders = new List<CloudProvider>();
-
-        public List<ICloudProviderDetector> CloudProviderDetectors => new List<ICloudProviderDetector>
+        private List<ICloudProviderDetector> CloudProviderDetectors => new List<ICloudProviderDetector>
             {
                 new GoogleDriveCloudProvider(),
                 new DropBoxCloudProvider(),
                 new OneDriveCloudProvider(),
                 new MegaCloudProvider(),
                 new BoxCloudProvider(),
                 new AppleCloudProvider(),
-                new AmazonDriveProvider()
+                new AmazonDriveProvider(),
             };
 
-        public List<CloudProvider> CloudProviders
-        {
-            get => cloudProviders.Where(x => !string.IsNullOrEmpty(x.SyncFolder)).ToList();
-            set => cloudProviders = value;
-        }
-
-        public async Task DetectInstalledCloudProvidersAsync()
+        public async Task<List<CloudProvider>> DetectInstalledCloudProvidersAsync()
         {
             var tasks = new List<Task<IList<CloudProvider>>>();
             var results = new List<CloudProvider>();
@@ -38,7 +30,7 @@ public async Task DetectInstalledCloudProvidersAsync()
 
             await Task.WhenAll(tasks);
 
-            cloudProviders = tasks.SelectMany(o => o.Result).ToList();
+            return tasks.SelectMany(o => o.Result).Distinct().ToList();
         }
     }
 }

Files/Filesystem/Cloud/Providers/OneDriveCloudProvider.cs

@@ -15,7 +15,7 @@ public async Task<IList<CloudProvider>> DetectAsync()
         {
             try
             {
-                using var connection = await AppServiceConnectionHelper.BuildConnection();
+                var connection = await AppServiceConnectionHelper.Instance;
                 if (connection != null)
                 {
                     var (status, response) = await connection.SendMessageWithRetryAsync(new ValueSet()