Added: new logic for working with adb, separation of the download fun…

…ction into a separate method
Sergey004 · Jan 2, 2024 · aba5c16 · aba5c16
1 parent 897ecc0
commit aba5c16
Show file tree

Hide file tree

Showing 6 changed files with 127 additions and 89 deletions.
diff --git a/Quest2-VRC.Core/Modules/ADB.cs b/Quest2-VRC.Core/Modules/ADB.cs
@@ -24,90 +24,7 @@ public static bool StartADB(bool sender, bool receiver, string hostip, bool wire
         {
 
             Console.WriteLine("Make sure you connect the headset to your computer and turn on the controllers");
-            if (!AdbServer.Instance.GetStatus().IsRunning)
-            {
-                AdbServer server = new AdbServer();
-                try
-                {
 
-                    bool exists = Directory.Exists("platform-tools"); // ADB Auto downloader
-                    if (!exists)
-                    {
-                        Console.WriteLine("ADB directory does not exist, creating...");
-                        Console.WriteLine("Downloading ADB");
-                        var client = new WebClient();
-                        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) == true)
-                        {
-                            string uri = "https://dl.google.com/android/repository/platform-tools-latest-windows.zip";
-                            string filename = "platform-tools-latest-windows.zip";
-                            string extractPath = AppDomain.CurrentDomain.BaseDirectory;
-                            client.DownloadFile(uri, filename);
-                            ZipFile.ExtractToDirectory(filename, extractPath);
-                            File.Delete(filename);
-                        }
-                        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) == true) // Really Mac OS?!
-                        {
-                            string uri = "https://dl.google.com/android/repository/platform-tools-latest-darwin.zip";
-                            string filename = "platform-tools-latest-darwin.zip";
-                            string extractPath = AppDomain.CurrentDomain.BaseDirectory;
-                            client.DownloadFile(uri, filename);
-                            ZipFile.ExtractToDirectory(filename, extractPath);
-                            File.Delete(filename);
-                        }
-                        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) == true) // Well, I can't imagine who would use this lib under Linux and in Mac OS XD
-                        {
-                            string uri = "https://dl.google.com/android/repository/platform-tools-latest-linux.zip";
-                            string filename = "platform-tools-latest-linux.zip";
-                            string extractPath = AppDomain.CurrentDomain.BaseDirectory;
-                            client.DownloadFile(uri, filename);
-                            ZipFile.ExtractToDirectory(filename, extractPath);
-                            File.Delete(filename);
-                        }
-                        Console.WriteLine("Download completed");
-                    }
-                    if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) == true)
-                    {
-                        StartServerResult result = server.StartServer(@"platform-tools\adb.exe", false);
-                        if (result != StartServerResult.Started)
-                        {
-                            Console.WriteLine("Can't start adb server, please try again");
-
-                            return false;
-                        }
-                    }
-                     if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) == true)
-                    {
-                        StartServerResult result = server.StartServer(@"platform-tools/adb", false);
-                        if (result != StartServerResult.Started)
-                        {
-                            Console.WriteLine("Can't start adb server, please try again");
-
-                            return false;
-                        }
-                    }
-                    if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) == true)
-                    {
-                        StartServerResult result = server.StartServer(@"platform-tools/adb", false);
-                        if (result != StartServerResult.Started)
-                        {
-                            Console.WriteLine("Can't start adb server, please try again");
-
-                            return false;
-                        }
-                    }
-                }
-                catch (WebException)
-                {
-                    Console.WriteLine("Unable to download ADB from Google servers, try again or download files manually https://developer.android.com/studio/releases/platform-tools, press any key to exit");
-
-                    return false;
-                }
-
-            }
-            else
-            {
-                Console.WriteLine("ADB server is already running, no checks are required");
-            }
 
             client = new AdbClient();
             client.Connect(hostip);
@@ -187,6 +104,18 @@ public static void StartTCPIP()
             process.StartInfo = startInfo;
             process.Start();
 
+        }
+        public static void ForceKillADB()
+        {
+
+            Process process = new Process();
+            ProcessStartInfo startInfo = new ProcessStartInfo();
+            startInfo.WindowStyle = ProcessWindowStyle.Hidden;
+            startInfo.FileName = "cmd.exe";
+            startInfo.Arguments = "/C platform-tools\\adb.exe kill-server";
+            process.StartInfo = startInfo;
+            process.Start();
+
         }
         public static string GetIP()
         {
@@ -226,7 +155,93 @@ public static async Task<string> GetZeroConfIP()
             return await Task.FromResult(deviceip);
         }
 
+        public static void DownLoadADB()
+        {
+            if (!AdbServer.Instance.GetStatus().IsRunning)
+            {
+                AdbServer server = new AdbServer();
+                try
+                {
 
+                    bool exists = Directory.Exists("platform-tools"); // ADB Auto downloader
+                    if (!exists)
+                    {
+                        Console.WriteLine("ADB directory does not exist, creating...");
+                        Console.WriteLine("Downloading ADB");
+                        var client = new WebClient();
+                        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) == true)
+                        {
+                            string uri = "https://dl.google.com/android/repository/platform-tools-latest-windows.zip";
+                            string filename = "platform-tools-latest-windows.zip";
+                            string extractPath = AppDomain.CurrentDomain.BaseDirectory;
+                            client.DownloadFile(uri, filename);
+                            ZipFile.ExtractToDirectory(filename, extractPath);
+                            File.Delete(filename);
+                        }
+                        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) == true) // Really Mac OS?!
+                        {
+                            string uri = "https://dl.google.com/android/repository/platform-tools-latest-darwin.zip";
+                            string filename = "platform-tools-latest-darwin.zip";
+                            string extractPath = AppDomain.CurrentDomain.BaseDirectory;
+                            client.DownloadFile(uri, filename);
+                            ZipFile.ExtractToDirectory(filename, extractPath);
+                            File.Delete(filename);
+                        }
+                        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) == true) // Well, I can't imagine who would use this lib under Linux and in Mac OS XD
+                        {
+                            string uri = "https://dl.google.com/android/repository/platform-tools-latest-linux.zip";
+                            string filename = "platform-tools-latest-linux.zip";
+                            string extractPath = AppDomain.CurrentDomain.BaseDirectory;
+                            client.DownloadFile(uri, filename);
+                            ZipFile.ExtractToDirectory(filename, extractPath);
+                            File.Delete(filename);
+                        }
+                        Console.WriteLine("Download completed");
+                    }
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) == true)
+                    {
+                        StartServerResult result = server.StartServer(@"platform-tools\adb.exe", false);
+                        if (result != StartServerResult.Started)
+                        {
+                            Console.WriteLine("Can't start adb server, please try again");
+
+
+                        }
+                    }
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) == true)
+                    {
+                        StartServerResult result = server.StartServer(@"platform-tools/adb", false);
+                        if (result != StartServerResult.Started)
+                        {
+                            Console.WriteLine("Can't start adb server, please try again");
+
+
+                        }
+                    }
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) == true)
+                    {
+                        StartServerResult result = server.StartServer(@"platform-tools/adb", false);
+                        if (result != StartServerResult.Started)
+                        {
+                            Console.WriteLine("Can't start adb server, please try again");
+
+
+                        }
+                    }
+                }
+                catch (WebException)
+                {
+                    Console.WriteLine("Unable to download ADB from Google servers, try again or download files manually https://developer.android.com/studio/releases/platform-tools, press any key to exit");
+
+
+                }
+
+            }
+            else
+            {
+                Console.WriteLine("ADB server is already running, no checks are required");
+            }
+        }
 
         public static void StopADB()
         {
@@ -235,12 +250,13 @@ public static void StopADB()
                 try
 
                 {
-                    client.KillAdb();
+
+                    ForceKillADB();
                     Environment.Exit(1987);
                 }
                 catch 
                 { 
-                    // IDK how thos works
+                    // IDK how this works
                 }
 
             }

diff --git a/Quest2-VRC.Core/Services/Sender.cs b/Quest2-VRC.Core/Services/Sender.cs
@@ -26,9 +26,6 @@ public class Global
             public static int gputempint;
             public static float WifiInt;
             public static bool LowHMDBat;
-
-
-
         }
 
         public static async void Run(bool wirlessmode, bool audioEnadled, bool disableerrmsg, string hostip)

diff --git a/Quest2-VRC.GUI/MainWindow.cs b/Quest2-VRC.GUI/MainWindow.cs
@@ -28,6 +28,12 @@ public MainWindow()
             materialSkinManager.AddFormToManage(this);
             materialSkinManager.Theme = MaterialSkinManager.Themes.DARK;
             materialSkinManager.ColorScheme = new ColorScheme(Primary.Amber800, Primary.Amber900, Primary.Cyan500, Accent.Cyan700, TextShade.WHITE);
+            if (File.Exists("platform-tools\\adb.exe") == false)
+            {
+                MessageBox.Show(resources.GetString("ADBNotFound"), resources.GetString("Error"), MessageBoxButtons.OK, MessageBoxIcon.Error);
+                ADB.DownLoadADB();
+            }
+
             materialLabel5.Text = resources.GetString("Ready");
 
         }
@@ -336,7 +342,7 @@ private async void materialSwitch1_CheckedChanged(object sender, EventArgs e)
                         materialSwitch1.Checked = false;
                     }
 
-                    
+
                 }
                 else if (dialogResult1 == DialogResult.No)
                 {
@@ -347,6 +353,7 @@ private async void materialSwitch1_CheckedChanged(object sender, EventArgs e)
                         ADB.StartTCPIP();
                         await Task.Delay(3000);
                         materialTextBox1.Text = ADB.GetIP();
+                        MessageBox.Show(resources.GetString("USBDisCon"), resources.GetString("ADBInTCPIP"), MessageBoxButtons.OK, MessageBoxIcon.Information);
                     }
                     else
                     {

diff --git a/Quest2-VRC.GUI/MainWindow.en-US.resx b/Quest2-VRC.GUI/MainWindow.en-US.resx
@@ -3101,4 +3101,10 @@ ZeroConf requires an additional program to be installed on Quest
   <data name="Manualinput" xml:space="preserve">
     <value>The input box has been unlocked for manual entry</value>
   </data>
+  <data name="ADBNotFound" xml:space="preserve">
+    <value>adb.exe is not found in the "platform-tools" directory, adb will be loaded after pressing "OK" button, make sure your device is connected to the internet.</value>
+  </data>
+  <data name="USBDisCon" xml:space="preserve">
+    <value>Disconnect the device from the computer for the wireless connection to work properly.</value>
+  </data>
 </root>
diff --git a/Quest2-VRC.GUI/MainWindow.resx b/Quest2-VRC.GUI/MainWindow.resx
@@ -3643,4 +3643,10 @@
   <data name="Manualinput" xml:space="preserve">
     <value></value>
   </data>
+  <data name="ADBNotFound" xml:space="preserve">
+    <value></value>
+  </data>
+  <data name="USBDisCon" xml:space="preserve">
+    <value></value>
+  </data>
 </root>
diff --git a/Quest2-VRC.GUI/MainWindow.ru-RU.resx b/Quest2-VRC.GUI/MainWindow.ru-RU.resx
@@ -3140,4 +3140,10 @@
   <data name="Manualinput" xml:space="preserve">
     <value>Строка ввода была разблокирована для ручного ввода</value>
   </data>
+  <data name="ADBNotFound" xml:space="preserve">
+    <value>adb.exe не найден в каталоге "platform-tools", adb будет загружен после нажатия кнопки "OK", убедитесь, что ваше устройство подключено к Интернету.</value>
+  </data>
+  <data name="USBDisCon" xml:space="preserve">
+    <value>Для правильной работы беспроводного соединения отсоедините устройство от компьютера.</value>
+  </data>
 </root>