Add missing timeouts. Update doc

Author: regaw-leinad

AndroidLib/Classes/AndroidController/Adb.cs

@@ -2,6 +2,7 @@
  * Adb.cs - Developed by Dan Wager for AndroidLib.dll
  */
 
+using System;
 using System.IO;
 
 namespace RegawMOD.Android
@@ -137,6 +138,7 @@ public static AdbCommand FormAdbShellCommand(Device device, bool rootShell, stri
         /// <remarks>Added specifically for RegawMOD CDMA Hero Rooter.  Always remember to pass "exit" as the last command or it will not return!</remarks>
         /// <param name="device">Specific <see cref="Device"/> to run the command on</param>
         /// <param name="inputLines">Lines of commands to send to shell</param>
+        [Obsolete("Method is deprecated, please use ExecuteAdbShellCommandInputString(Device, int, string...) instead.")]
         public static void ExecuteAdbShellCommandInputString(Device device, params string[] inputLines)
         {
             lock (_lock)
@@ -145,6 +147,21 @@ public static void ExecuteAdbShellCommandInputString(Device device, params strin
             }
         }
 
+        /// <summary>
+        /// Opens Adb Shell and allows input to be typed directly to the shell.  Experimental!
+        /// </summary>
+        /// <remarks>Added specifically for RegawMOD CDMA Hero Rooter.  Always remember to pass "exit" as the last command or it will not return!</remarks>
+        /// <param name="device">Specific <see cref="Device"/> to run the command on</param>
+        /// <param name="timeout">The timeout in milliseonds</param>
+        /// <param name="inputLines">Lines of commands to send to shell</param>
+        public static void ExecuteAdbShellCommandInputString(Device device, int timeout, params string[] inputLines)
+        {
+            lock (_lock)
+            {
+                Command.RunProcessWriteInput(AndroidController.Instance.ResourceDirectory + ADB_EXE, "shell", timeout, inputLines);
+            }
+        }
+
         /// <summary>
         /// Executes an <see cref="AdbCommand"/> on the running Adb Server
         /// </summary>

AndroidLib/Classes/AndroidController/Device.cs

@@ -201,7 +201,7 @@ private void RebootBootloaderThread()
         /// </summary>
         /// <param name="fileOnDevice">Path to file to pull from device</param>
         /// <param name="destinationDirectory">Directory on local computer to pull file to</param>
-        /// /// <param name="timeout">The timeout for this operation (Default = -1)</param>
+        /// /// <param name="timeout">The timeout for this operation in milliseconds (Default = -1)</param>
         /// <returns>True if file is pulled, false if pull failed</returns>
         public bool PullFile(string fileOnDevice, string destinationDirectory, int timeout = Command.DEFAULT_TIMEOUT)
         {
@@ -214,7 +214,7 @@ public bool PullFile(string fileOnDevice, string destinationDirectory, int timeo
         /// </summary>
         /// <param name="filePath">The path to the file on the computer you want to push</param>
         /// <param name="destinationFilePath">The desired full path of the file after pushing to the device (including file name and extension)</param>
-        /// <param name="timeout">The timeout for this operation (Default = -1)</param>
+        /// <param name="timeout">The timeout for this operation in milliseconds (Default = -1)</param>
         /// <returns>If the push was successful</returns>
         public bool PushFile(string filePath, string destinationFilePath, int timeout = Command.DEFAULT_TIMEOUT)
         {
@@ -227,6 +227,7 @@ public bool PushFile(string filePath, string destinationFilePath, int timeout =
         /// </summary>
         /// <param name="location">Path to folder to pull from device</param>
         /// <param name="destination">Directory on local computer to pull file to</param>
+        /// <param name="timeout">The timeout for this operation in milliseconds (Default = -1)</param>
         /// <returns>True if directory is pulled, false if pull failed</returns>
         public bool PullDirectory(string location, string destination, int timeout = Command.DEFAULT_TIMEOUT)
         {
@@ -238,6 +239,7 @@ public bool PullDirectory(string location, string destination, int timeout = Com
         /// Installs an application from the local computer to the Android device
         /// </summary>
         /// <param name="location">Full path of apk on computer</param>
+        /// <param name="timeout">The timeout for this operation in milliseconds (Default = -1)</param>
         /// <returns>True if install is successful, False if install fails for any reason</returns>
         public bool InstallApk(string location, int timeout = Command.DEFAULT_TIMEOUT)
         {

AndroidLib/Classes/Util/Command.cs

@@ -217,7 +217,7 @@ internal static int RunProcessReturnExitCode(string executable, string arguments
             return exitCode;
         }
 
-        // TODO: Change to timeout implementation
+        [Obsolete("Method is deprecated, please use RunProcessWriteInput(string, string, int, string...) instead.")]
         internal static void RunProcessWriteInput(string executable, string arguments, params string[] input)
         {
             using (Process p = new Process())
@@ -240,6 +240,28 @@ internal static void RunProcessWriteInput(string executable, string arguments, p
             }
         }
 
+        internal static void RunProcessWriteInput(string executable, string arguments, int timeout, params string[] input)
+        {
+            using (Process p = new Process())
+            {
+                p.StartInfo.FileName = executable;
+                p.StartInfo.Arguments = arguments;
+                p.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+                p.StartInfo.CreateNoWindow = true;
+                p.StartInfo.UseShellExecute = false;
+
+                p.StartInfo.RedirectStandardInput = true;
+
+                p.Start();
+
+                using (StreamWriter w = p.StandardInput)
+                    for (int i = 0; i < input.Length; i++)
+                        w.WriteLine(input[i]);
+
+                p.WaitForExit(timeout);
+            }
+        }
+
         internal static bool IsProcessRunning(string processName)
         {
             Process[] processes = Process.GetProcesses();