Merge pull request regaw-leinad#1 from regaw-leinad/master

Update to latest version

Author: IceDragon59

AndroidLib/Classes/AndroidController/Adb.cs

@@ -14,8 +14,16 @@ namespace RegawMOD.Android
     public class AdbCommand
     {
         private string command;
+        private int timeout;
         internal string Command { get { return this.command; } }
-        internal AdbCommand(string command) { this.command = command; }
+        internal int Timeout { get { return this.timeout; } }
+        internal AdbCommand(string command) { this.command = command; this.timeout = RegawMOD.Command.DEFAULT_TIMEOUT; }
+
+        /// <summary>
+        /// Sets the timeout for the AdbCommand
+        /// </summary>
+        /// <param name="timeout">The timeout for the command in milliseconds</param>
+        public AdbCommand WithTimeout(int timeout) { this.timeout = timeout; return this; }
     }
 
     /// <summary>
@@ -26,6 +34,7 @@ public static class Adb
         private static object _lock = "U is lawked";
         internal const string ADB = "adb";
         internal const string ADB_EXE = "adb.exe";
+        internal const string ADB_VERSION = "1.0.31";
 
         /// <summary>
         /// Forms an <see cref="AdbCommand"/> that is passed to <c>Adb.ExecuteAdbCommand()</c>
@@ -149,7 +158,7 @@ public static string ExecuteAdbCommand(AdbCommand command, bool forceRegular = f
 
             lock (_lock)
             {
-                result = Command.RunProcessReturnOutput(AndroidController.Instance.ResourceDirectory + ADB_EXE, command.Command, forceRegular);
+                result = Command.RunProcessReturnOutput(AndroidController.Instance.ResourceDirectory + ADB_EXE, command.Command, forceRegular, command.Timeout);
             }
 
             return result;
@@ -180,7 +189,7 @@ public static int ExecuteAdbCommandReturnExitCode(AdbCommand command)
 
             lock (_lock)
             {
-                result = Command.RunProcessReturnExitCode(AndroidController.Instance.ResourceDirectory + ADB_EXE, command.Command);
+                result = Command.RunProcessReturnExitCode(AndroidController.Instance.ResourceDirectory + ADB_EXE, command.Command, command.Timeout);
             }
 
             return result;

AndroidLib/Classes/AndroidController/AndroidController.cs

@@ -74,6 +74,7 @@ public sealed class AndroidController
         #region MEMBER VARIABLES
         private string resourceDirectory;
         private List<string> connectedDevices;
+        private bool Extract_Resources = false;
         #endregion
 
         #region PROPERTIES
@@ -126,25 +127,24 @@ private AndroidController()
         #region PRIVATE METHODS
         private void CreateResourceDirectories()
         {
-            if (!ResourceFolderManager.Register(ANDROID_CONTROLLER_TMP_FOLDER))
+            if (!Adb.ExecuteAdbCommand(new AdbCommand("version")).Contains(Adb.ADB_VERSION))
             {
-                if (File.Exists(this.resourceDirectory + Adb.ADB_EXE) && Adb.ServerRunning)
-                {
-                    Adb.KillServer();
-                    Thread.Sleep(1000);
-                }
-
+                Adb.KillServer();
+                Thread.Sleep(1000);
                 ResourceFolderManager.Unregister(ANDROID_CONTROLLER_TMP_FOLDER);
+                Extract_Resources = true;
             }
-
             ResourceFolderManager.Register(ANDROID_CONTROLLER_TMP_FOLDER);
         }
 
         private void ExtractResources()
         {
-            string[] res = new string[RESOURCES.Count];
-            RESOURCES.Keys.CopyTo(res, 0);
-            Extract.Resources(this, this.resourceDirectory, "Resources.AndroidController", res);
+            if (this.Extract_Resources)
+            {
+                string[] res = new string[RESOURCES.Count];
+                RESOURCES.Keys.CopyTo(res, 0);
+                Extract.Resources(this, this.resourceDirectory, "Resources.AndroidController", res);
+            }
         }
         #endregion
 
@@ -160,8 +160,6 @@ public void Dispose()
                 Adb.KillServer();
                 Thread.Sleep(1000);
             }
-
-            ResourceFolderManager.Unregister(ANDROID_CONTROLLER_TMP_FOLDER);
             AndroidController.instance = null;
         }
 
@@ -300,19 +298,34 @@ public void UpdateDeviceList()
             }
         }
 
+        private bool _CancelRequest;
+        /// <summary>
+        /// Set to true to cancel a WaitForDevice() method call
+        /// </summary>
+        public bool CancelWait
+        {
+            get { return _CancelRequest; }
+            set { _CancelRequest = value; }
+        }
+
         /// <summary>
         /// Pauses thread until 1 or more Android devices are connected
         /// </summary>
         /// <remarks>Do Not Use in Windows Forms applications, as this method pauses the current thread.  Works fine in Console Applications</remarks>
         public void WaitForDevice()
         {
-		/* Entering an endless loop will exaust CPU. 
-		 * Since this method must be called in a child thread in Windows Presentation Foundation (WPF) or Windows Form Apps,
-		 * sleeping thread for 250 miliSecond (1/4 of a second)
-		 * will be more friendly to the CPU. Nontheless checking 4 times for a connected device in each second is more than enough,
-		 * and will not result in late response from the app if a device gets connected. 
-	         */
-            while (!this.HasConnectedDevices) { Thread.Sleep(250); }
+            /* Entering an endless loop will exhaust CPU. 
+             * Since this method must be called in a child thread in Windows Presentation Foundation (WPF) or Windows Form Apps,
+             * sleeping thread for 250 miliSecond (1/4 of a second)
+             * will be more friendly to the CPU. Nonetheless checking 4 times for a connected device in each second is more than enough,
+             * and will not result in late response from the app if a device gets connected. 
+             */
+            while (!this.HasConnectedDevices && !this.CancelWait)
+            {
+                Thread.Sleep(250);
+            }
+
+            this.CancelWait = false;
         }
         #endregion
     }

AndroidLib/Classes/AndroidController/BuildProp.cs

@@ -2,7 +2,6 @@
  * BuildProp.cs - Developed by Dan Wager for AndroidLib.dll
  */
 
-using RegawMOD.Util;
 using System;
 using System.Collections.Generic;
 using System.IO;

AndroidLib/Classes/AndroidController/BusyBox.cs

@@ -54,8 +54,7 @@ public void Update()
 
             if (!this.device.HasRoot || this.device.State != DeviceState.ONLINE)
             {
-                this.isInstalled = false;
-                this.version = null;
+                SetNoBusybox();
                 return;
             }
 
@@ -66,22 +65,34 @@ public void Update()
 
                 if (check.Contains(string.Format("{0}: not found", EXECUTABLE)))
                 {
-                    this.isInstalled = false;
-                    this.version = null;
+                    SetNoBusybox();
                     return;
                 }
 
                 this.isInstalled = true;
 
                 this.version = check.Split(' ')[1].Substring(1);
 
-                while (s.ReadLine() != "Currently defined functions:") { }
+                while (s.Peek() != -1 && s.ReadLine() != "Currently defined functions:") { }
 
                 string[] cmds = s.ReadToEnd().Replace(" ", "").Replace("\r\r\n\t", "").Trim('\t', '\r', '\n').Split(',');
 
-                foreach (string cmd in cmds)
-                    this.commands.Add(cmd);
+                if (cmds.Length.Equals(0))
+                {
+                    SetNoBusybox();
+                }
+                else
+                {
+                    foreach (string cmd in cmds)
+                        this.commands.Add(cmd);
+                }
             }
         }
+
+        private void SetNoBusybox()
+        {
+            this.isInstalled = false;
+            this.version = null;
+        }
     }
 }