Update adb based on DanTheMan ig, I didn't really check

Author: ComputerElite

QuestAppVersionSwitcher/Adb/AdbServer.cs

@@ -3,126 +3,104 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using ComputerUtils.Android;
-using ComputerUtils.Android.Logging;
+using Application = Android.App.Application;
 
 namespace DanTheMan827.OnDeviceADB
 {
-     
     /// <summary>
     /// A class for managing the adb server.
     /// </summary>
     public class AdbServer : IDisposable
     {
-        private static string? FilesDir => AndroidCore.context?.FilesDir?.Path;
-        private static string? CacheDir => AndroidCore.context?.CacheDir?.Path;
-        private static string? NativeLibsDir => AndroidCore.context.ApplicationInfo?.NativeLibraryDir;
+        public static int AdbPort = 5037;
+        public static AdbServer Instance { get; private set; } = new AdbServer();
+        private static string FilesDir => Application.Context?.FilesDir?.Path ?? throw new Exception("Unable to determine application files path");
+        private static string CacheDir => Application.Context?.CacheDir?.Path ?? throw new Exception("Unable to determine application cache path");
+        private static string NativeLibsDir => Application.Context.ApplicationInfo?.NativeLibraryDir ?? throw new Exception("Unable to determine native libs path");
+        private CancellationTokenSource? CancelToken { get; set; }
         private Process? ServerProcess { get; set; }
-        public static AdbServer Instance { get; set; }
 
         /// <summary>
         /// Path to the adb binary.
         /// </summary>
-        public static string? AdbPath => NativeLibsDir != null ? Path.Combine(NativeLibsDir, "libadb.so") : null;
+        public static string AdbPath => NativeLibsDir != null ? Path.Combine(NativeLibsDir, "libadb.so") : throw new Exception("Unable to determine adb path");
 
         /// <summary>
         /// If the server is running
         /// </summary>
         public bool IsRunning => ServerProcess != null && !ServerProcess.HasExited;
 
-        public AdbServer()
+        private AdbServer() { }
+        private async Task StartServer()
         {
-            Debug.Assert(FilesDir != null);
-            Debug.Assert(CacheDir != null);
-            Debug.Assert(NativeLibsDir != null);
-            Debug.Assert(AdbPath != null);
-            Instance = this;
-        }
-        private void StartServer(string arguments)
-        {
-            Thread t = new Thread(() =>
-            {
-                // Create and configure the ProcessStartInfo.
-                var adbInfo = new ProcessStartInfo(AdbPath, arguments);
-                adbInfo.WorkingDirectory = FilesDir;
-                adbInfo.UseShellExecute = false;
-                adbInfo.RedirectStandardOutput = true;
-                adbInfo.RedirectStandardError = true;
-                adbInfo.EnvironmentVariables["HOME"] = FilesDir;
-                adbInfo.EnvironmentVariables["TMPDIR"] = CacheDir;
-
-                // Start the process
-                Logger.Log("Starting adb server process from " + adbInfo.FileName + " with arguments " + adbInfo.Arguments);
-                ServerProcess = Process.Start(adbInfo);
-
-                if (ServerProcess == null)
-                {
-                    Logger.Log("Adb server failed to start", LoggingType.Error);
-                }
-                
-                // Wait for the server to exit
-                while (!ServerProcess.StandardError.EndOfStream)
-                {
-                    Logger.Log(ServerProcess.StandardError.ReadLine());
-                }
-                while (!ServerProcess.StandardOutput.EndOfStream)
-                {
-                    Logger.Log(ServerProcess.StandardOutput.ReadLine());
-                }
-                ServerProcess.WaitForExit(); 
-                // Log standard output and error
-                Logger.Log("Adb server exited", LoggingType.Error);
-
-                // Dispose our variables.
-                DisposeVariables(false);
-            });
-            t.Start();
-        }
+            // Asserts
+            Debug.Assert(this.ServerProcess == null);
+            Debug.Assert(this.CancelToken == null);
 
-        private void KillServer()
-        {
-            
-            if (ServerProcess != null && !ServerProcess.HasExited)
+            // Create and configure the ProcessStartInfo.
+            var adbInfo = new ProcessStartInfo(AdbPath, $"-P {AdbPort} server nodaemon");
+            adbInfo.WorkingDirectory = FilesDir;
+            adbInfo.RedirectStandardOutput = true;
+            adbInfo.RedirectStandardError = true;
+            adbInfo.EnvironmentVariables["HOME"] = FilesDir;
+            adbInfo.EnvironmentVariables["TMPDIR"] = CacheDir;
+            adbInfo.EnvironmentVariables["ADB_MDNS"] = "0";
+            adbInfo.EnvironmentVariables["ADB_MDNS_AUTO_CONNECT"] = "";
+
+            // Start the process
+            ServerProcess = Process.Start(adbInfo);
+
+            if (ServerProcess == null)
             {
-                ServerProcess.Kill();
+                throw new Exception("adb server failed to start");
             }
+
+            // Dispose any token source that may exist (there shouldn't be any)
+            CancelToken?.Dispose();
+
+            // Create our CancellationTokenSource and register the process kill action.
+            CancelToken = new CancellationTokenSource();
+            CancelToken.Token.Register(this.ServerProcess.Kill);
+
+            // Wait for the server to exit
+            ServerProcess.WaitForExit();
+
+            // Dispose our variables.
+            DisposeVariables(false);
         }
 
         private void DisposeVariables(bool attemptKill)
         {
             // Stop the server
             if (attemptKill && ServerProcess != null && !ServerProcess.HasExited)
             {
-                KillServer();
+                ServerProcess.Kill();
             }
 
             // Cleanup the token and process
             ServerProcess?.Dispose();
             ServerProcess = null;
+
+            CancelToken?.Dispose();
+            CancelToken = null;
         }
 
         /// <summary>
         /// Starts the server if not already running.
         /// </summary>
-        public void Start()
+        public async void Start()
         {
             if (!IsRunning)
             {
-                StartServer("server nodaemon");
+                await StartServer();
             }
         }
 
         /// <summary>
         /// Stops the server if running.
         /// </summary>
-        public void Stop() => DisposeVariables(true);
+        public void Stop(bool force = true) => DisposeVariables(force);
 
         public void Dispose() => Stop();
-
-        public void Pair(string rPort, string rCode)
-        {
-            KillServer();
-            StartServer("pair 127.0.0.1:" + rPort + " " + rCode);
-        }
     }
 }