Code improvements

Author: gave92

Files.Launcher/Win32API.cs

@@ -93,26 +93,6 @@ public static string[] CommandLineToArgs(string commandLine)
             }
         }
 
-        public static void UnlockBitlockerDrive(string drive, string password)
-        {
-            try
-            {
-                Process process = new Process();
-                process.StartInfo.UseShellExecute = true;
-                process.StartInfo.Verb = "runas";
-                process.StartInfo.FileName = "powershell.exe";
-                process.StartInfo.CreateNoWindow = true;
-                process.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
-                process.StartInfo.Arguments = $"-command \"$SecureString = ConvertTo-SecureString '{password}' -AsPlainText -Force; Unlock-BitLocker -MountPoint '{drive}' -Password $SecureString\"";
-                process.Start();
-                process.WaitForExit(30 * 1000);
-            }
-            catch (Win32Exception)
-            {
-                // If user cancels UAC
-            }
-        }
-
         public static (string icon, bool isCustom) GetFileOverlayIcon(string path)
         {
             var shfi = new Shell32.SHFILEINFO();
@@ -149,13 +129,19 @@ private static void RunPowershellCommand(string command, bool runAsAdmin)
                 process.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
                 process.StartInfo.Arguments = command;
                 process.Start();
+                process.WaitForExit(30 * 1000);
             }
             catch (Win32Exception)
             {
                 // If user cancels UAC
             }
         }
 
+        public static void UnlockBitlockerDrive(string drive, string password)
+        {
+            RunPowershellCommand($"-command \"$SecureString = ConvertTo-SecureString '{password}' -AsPlainText -Force; Unlock-BitLocker -MountPoint '{drive}' -Password $SecureString\"", true);
+        }
+
         public static void OpenFormatDriveDialog(string drive)
         {
             // format requires elevation

Files/Filesystem/DriveItem.cs

@@ -68,14 +68,12 @@ public async Task Update()
             try
             {
                 // Delay is needed to apply the new name
-                var properties = await Task.Delay(TimeSpan.FromSeconds(2)).ContinueWith(
-                    _ => Root.Properties.RetrievePropertiesAsync(new[] { "System.ItemNameDisplay" }).AsTask().WithTimeout(TimeSpan.FromSeconds(5)), 
-                    TaskContinuationOptions.OnlyOnRanToCompletion).Unwrap();
+                var properties = await Root.Properties.RetrievePropertiesAsync(new[] { "System.ItemNameDisplay" })
+                    .AsTask().WithTimeout(TimeSpan.FromSeconds(5));
                 Text = (string)properties["System.ItemNameDisplay"];
             }
             catch (NullReferenceException)
             {
-
             }
         }