install apk: display error message if failed

Author: unitycoder

Diff for: UnityLauncherPro/MainWindow.xaml.cs

@@ -1196,7 +1196,7 @@ private void Window_Closing(object sender, CancelEventArgs e)
             CloseHubPipeAsync();
         }
 
-       private void CloseThemeEditor()
+        private void CloseThemeEditor()
         {
             if (themeEditorWindow != null) themeEditorWindow.Close();
         }
@@ -3583,24 +3583,38 @@ private void menuInstallLastAPK_Click(object sender, RoutedEventArgs e)
                 pars += $" && adb shell monkey -p {packageName} 1";
             }
 
-            //Tools.LaunchExe(cmd, pars);
-            var process = Tools.LaunchExe(cmd, pars, captureOutput: true);
-            var output = process.StandardOutput.ReadToEnd();
-            var errorOutput = process.StandardError.ReadToEnd().Replace("\r", "").Replace("\n", "");
+            try
+            {
+                //Tools.LaunchExe(cmd, pars);
+                var process = Tools.LaunchExe(cmd, pars, captureOutput: true);
+                var output = process.StandardOutput.ReadToEnd();
+                var errorOutput = process.StandardError.ReadToEnd().Replace("\r", "").Replace("\n", "");
 
-            process.WaitForExit();
+                process.WaitForExit();
 
-            // Console.WriteLine(output);
-            if (!string.IsNullOrEmpty(errorOutput))
+                // Console.WriteLine(output);
+                if (!string.IsNullOrEmpty(errorOutput))
+                {
+                    SetStatus("Error installing APK: " + errorOutput);
+                }
+                else
+                {
+                    // get apk name from path
+                    var apkName = Path.GetFileName(playerPath);
+                    if (chkStreamerMode.IsChecked == true) apkName = " (hidden in streamermode)";
+                    SetStatus("Installed APK:" + apkName);
+                }
+
+            }
+            catch (Win32Exception ex)
             {
-                SetStatus("Error installing APK: " + errorOutput);
+                // Handle case where 'adb' is not found
+                SetStatus($"Error: 'adb' not found. Ensure it's installed and added to PATH. Details: {ex.Message}");
             }
-            else
+            catch (Exception ex)
             {
-                // get apk name from path
-                var apkName = Path.GetFileName(playerPath);
-                if (chkStreamerMode.IsChecked == true) apkName = " (hidden in streamermode)";
-                SetStatus("Installed APK:" + apkName);
+                // Handle other unexpected exceptions
+                SetStatus($"An unexpected error occurred: {ex.Message}");
             }
         }