Return success from HandleApplicationLaunch. Don't show error dialog if file was launched

Author: gave92

src/Files.Launcher/MessageHandlers/ApplicationLaunchHandler.cs

@@ -12,6 +12,7 @@
 using System.Threading.Tasks;
 using Vanara.PInvoke;
 using Vanara.Windows.Shell;
+using Windows.Foundation.Collections;
 
 namespace FilesFullTrust.MessageHandlers
 {
@@ -21,7 +22,7 @@ public void Initialize(PipeStream connection)
         {
         }
 
-        public Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)
+        public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object> message, string arguments)
         {
             switch (arguments)
             {
@@ -38,12 +39,11 @@ public Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object
                     if (message.ContainsKey("Application"))
                     {
                         var application = (string)message["Application"];
-                        HandleApplicationLaunch(application, message);
-                    }
-                    else if (message.ContainsKey("ApplicationList"))
-                    {
-                        var applicationList = JsonConvert.DeserializeObject<IEnumerable<string>>((string)message["ApplicationList"]);
-                        HandleApplicationsLaunch(applicationList, message);
+                        var success = await HandleApplicationLaunch(application, message);
+                        await Win32API.SendMessageAsync(connection, new ValueSet()
+                        {
+                            { "Success", success }
+                        }, message.Get("RequestID", (string)null));
                     }
                     break;
 
@@ -53,22 +53,13 @@ public Task ParseArgumentsAsync(PipeStream connection, Dictionary<string, object
                         var afPath = Path.Combine(Path.GetTempPath(), "CompatibilityTroubleshooterAnswerFile.xml");
                         File.WriteAllText(afPath, string.Format("<?xml version=\"1.0\" encoding=\"UTF-8\"?><Answers Version=\"1.0\"><Interaction ID=\"IT_LaunchMethod\"><Value>CompatTab</Value></Interaction><Interaction ID=\"IT_BrowseForFile\"><Value>{0}</Value></Interaction></Answers>", filePath));
                         message["Parameters"] = $"/id PCWDiagnostic /af \"{afPath}\"";
-                        HandleApplicationLaunch("msdt.exe", message);
+                        await HandleApplicationLaunch("msdt.exe", message);
                     }
                     break;
             }
-            return Task.CompletedTask;
-        }
-
-        private void HandleApplicationsLaunch(IEnumerable<string> applications, Dictionary<string, object> message)
-        {
-            foreach (var application in applications)
-            {
-                HandleApplicationLaunch(application, message);
-            }
         }
 
-        private async void HandleApplicationLaunch(string application, Dictionary<string, object> message)
+        private async Task<bool> HandleApplicationLaunch(string application, Dictionary<string, object> message)
         {
             var arguments = message.Get("Parameters", "");
             var workingDirectory = message.Get("WorkingDirectory", "");
@@ -77,8 +68,7 @@ private async void HandleApplicationLaunch(string application, Dictionary<string
             if (new[] { ".vhd", ".vhdx" }.Contains(Path.GetExtension(application).ToLowerInvariant()))
             {
                 // Use powershell to mount vhds as this requires admin rights
-                Win32API.MountVhdDisk(application);
-                return;
+                return Win32API.MountVhdDisk(application);
             }
 
             try
@@ -123,6 +113,7 @@ private async void HandleApplicationLaunch(string application, Dictionary<string
                 process.StartInfo.WorkingDirectory = workingDirectory;
                 process.Start();
                 Win32API.BringToForeground(currentWindows);
+                return true;
             }
             catch (Win32Exception)
             {
@@ -136,12 +127,13 @@ private async void HandleApplicationLaunch(string application, Dictionary<string
                 {
                     process.Start();
                     Win32API.BringToForeground(currentWindows);
+                    return true;
                 }
                 catch (Win32Exception)
                 {
                     try
                     {
-                        await Win32API.StartSTATask(() =>
+                        return await Win32API.StartSTATask(() =>
                         {
                             var split = application.Split('|').Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => GetMtpPath(x));
                             if (split.Count() == 1)
@@ -172,16 +164,19 @@ await Win32API.StartSTATask(() =>
                     catch (Win32Exception)
                     {
                         // Cannot open file (e.g DLL)
+                        return false;
                     }
                     catch (ArgumentException)
                     {
                         // Cannot open file (e.g DLL)
+                        return false;
                     }
                 }
             }
             catch (InvalidOperationException)
             {
                 // Invalid file path
+                return false;
             }
         }
 

src/Files.Launcher/Win32API.cs

@@ -354,10 +354,10 @@ public static void SetVolumeLabel(string driveName, string newLabel)
             RunPowershellCommand($"-command \"$Signature = '[DllImport(\\\"kernel32.dll\\\", SetLastError = false)]public static extern bool SetVolumeLabel(string lpRootPathName, string lpVolumeName);'; $SetVolumeLabel = Add-Type -MemberDefinition $Signature -Name \"Win32SetVolumeLabel\" -Namespace Win32Functions -PassThru; $SetVolumeLabel::SetVolumeLabel('{driveName}', '{newLabel}')\"", true);
         }
 
-        public static void MountVhdDisk(string vhdPath)
+        public static bool MountVhdDisk(string vhdPath)
         {
             // mounting requires elevation
-            RunPowershellCommand($"-command \"Mount-DiskImage -ImagePath '{vhdPath}'\"", true);
+            return RunPowershellCommand($"-command \"Mount-DiskImage -ImagePath '{vhdPath}'\"", true);
         }
 
         public static Bitmap GetBitmapFromHBitmap(HBITMAP hBitmap)

src/Files/Helpers/Win32Helpers.cs

@@ -32,8 +32,7 @@ public static async Task<bool> InvokeWin32ComponentsAsync(IEnumerable<string> ap
                 {
                     { "Arguments", "LaunchApp" },
                     { "WorkingDirectory", string.IsNullOrEmpty(workingDirectory) ? associatedInstance?.FilesystemViewModel?.WorkingDirectory : workingDirectory },
-                    { "Application", applicationPaths.FirstOrDefault() },
-                    { "ApplicationList", JsonConvert.SerializeObject(applicationPaths) },
+                    { "Application", applicationPaths.FirstOrDefault() }
                 };
 
                 if (runAsAdmin)

src/Files/ViewModels/NavToolbarViewModel.cs

@@ -934,30 +934,11 @@ public async Task CheckPathInput(string currentInput, string currentSelectedPath
                                 ? CommonPaths.HomePath
                                 : shellPage.FilesystemViewModel.WorkingDirectory;
 
-                            // Launch terminal application if possible
-                            foreach (var terminal in App.TerminalController.Model.Terminals)
+                            if (await LaunchApplicationFromPath(currentInput, workingDir))
                             {
-                                if (terminal.Path.Equals(currentInput, StringComparison.OrdinalIgnoreCase)
-                                    || terminal.Path.Equals(currentInput + ".exe", StringComparison.OrdinalIgnoreCase) || terminal.Name.Equals(currentInput, StringComparison.OrdinalIgnoreCase))
-                                {
-                                    var connection = await AppServiceConnectionHelper.Instance;
-                                    if (connection != null)
-                                    {
-                                        var value = new ValueSet()
-                                        {
-                                            { "Arguments", "LaunchApp" },
-                                            { "WorkingDirectory", workingDir },
-                                            { "Application", terminal.Path },
-                                            { "Parameters", string.Format(terminal.Arguments, workingDir) }
-                                        };
-                                        await connection.SendMessageAsync(value);
-                                    }
-                                    return;
-                                }
+                                return;
                             }
 
-                            await LaunchApplicationFromPath(currentInput, workingDir);
-
                             try
                             {
                                 if (!await Launcher.LaunchUriAsync(new Uri(currentInput)))
@@ -979,7 +960,7 @@ await DialogDisplayHelper.ShowDialogAsync("InvalidItemDialogTitle".GetLocalized(
             }
         }
 
-        private static async Task LaunchApplicationFromPath(string currentInput, string workingDir)
+        private static async Task<bool> LaunchApplicationFromPath(string currentInput, string workingDir)
         {
             var trimmedInput= currentInput.Trim();
             var fileName = trimmedInput;
@@ -1001,8 +982,11 @@ private static async Task LaunchApplicationFromPath(string currentInput, string
                     { "Application", fileName },
                     { "Parameters", arguments }
                 };
-                await connection.SendMessageAsync(value);
+                var (status, response) = await connection.SendMessageForResponseAsync(value);
+                return status == Windows.ApplicationModel.AppService.AppServiceResponseStatus.Success && response.Get("Success", false);
             }
+
+            return false;
         }
 
         public async void SetAddressBarSuggestions(AutoSuggestBox sender, IShellPage shellpage, int maxSuggestions = 7)