roottools 3.4 replace 2.6 and caused refactoring because shell calls are

not synchronous anymore

Author: asksven

.classpath

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="libs/RootTools-2.6.jar"/>
 	<classpathentry kind="lib" path="libs/jackson-all-1.9.11.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>

libs/RootTools-2.6.jar

@@ -6,9 +6,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+
+
 //import com.asksven.andoid.common.contrib.Shell;
 import com.stericson.RootTools.RootTools;
 import com.stericson.RootTools.execution.Command;
+import com.stericson.RootTools.execution.CommandCapture;
 import com.stericson.RootTools.execution.Shell;
 
 /**
@@ -51,7 +54,8 @@ public synchronized List<String> run(String command)
 			// reopen if for whatever reason the shell got closed
 			NonRootShell.getInstance();
 		}
-		Command shellCommand = new Command(0, command)
+		
+		CommandCapture shellCommand = new CommandCapture(0, command)
 		{
 		        @Override
 		        public void output(int id, String line)
@@ -61,7 +65,13 @@ public void output(int id, String line)
 		};
 		try
 		{
-			m_shell.add(shellCommand).waitForFinish();
+			m_shell.add(shellCommand);
+			
+			// we need to make this synchronous
+			while (!shellCommand.isFinished())
+			{
+				Thread.sleep(100);
+			}
 		}
 		catch (Exception e)
 		{

libs/RootTools-3.4.jar

@@ -6,9 +6,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+
 //import com.asksven.andoid.common.contrib.Shell;
 import com.stericson.RootTools.RootTools;
 import com.stericson.RootTools.execution.Command;
+import com.stericson.RootTools.execution.CommandCapture;
 import com.stericson.RootTools.execution.Shell;
 
 /**
@@ -61,7 +63,8 @@ public synchronized List<String> run(String command)
 			// reopen if for whatever reason the shell got closed
 			RootShell.getInstance();
 		}
-		Command shellCommand = new Command(0, command)
+		
+		CommandCapture shellCommand = new CommandCapture(0, command)
 		{
 		        @Override
 		        public void output(int id, String line)
@@ -71,7 +74,13 @@ public void output(int id, String line)
 		};
 		try
 		{
-			RootTools.getShell(true).add(shellCommand).waitForFinish();
+			RootTools.getShell(true).add(shellCommand);
+			
+			// we need to make this synchronous
+			while (!shellCommand.isFinished())
+			{
+				Thread.sleep(100);
+			}
 		}
 		catch (Exception e)
 		{

src/com/asksven/android/common/NonRootShell.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014 asksven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.asksven.android.common;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+/**
+ * @author sven
+ *
+ */
+public class Shell extends TestCase
+{
+	public void testShell()
+	{
+		List<String> res = NonRootShell.getInstance().run("ls -l /");
+		assertTrue(res !=null);
+		assertTrue(!res.isEmpty());
+	}
+
+}