Merge pull request #44 from mgatelabs/2019.10.4

2019.10.4

Author: mgatelabs

build.xml

@@ -8,7 +8,7 @@
         <copydir src="./extra" dest="./release"/>
         <copy file="./target/phone-piper.jar" tofile="./release/phone-piper.jar"/>
         <copy file="./LICENSE.txt" tofile="./release/LICENSE.txt"/>
-        <zip destfile="./target/PhonePiper2019.10.3.zip">
+        <zip destfile="./target/PhonePiper2019.10.4.zip">
             <fileset dir="./release" includes="**/*"/>
         </zip>
         <delete dir="./release"/>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.mgatelabs</groupId>
     <artifactId>PhonePiper</artifactId>
-    <version>2019.10.3-SNAPSHOT</version>
+    <version>2019.10.4-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

src/main/java/com/mgatelabs/piper/runners/ScriptRunner.java

@@ -182,35 +182,6 @@ public int compare(VarDefinition o1, VarDefinition o2) {
         status = Status.INIT;
     }
 
-    public void stopShell() {
-        /*
-        if (shell != null) {
-            try {
-                shell.shutdown();
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
-            shell = null;
-        }
-        */
-    }
-
-    public String restartShell() {
-        StringBuilder sb = new StringBuilder();
-
-        sb.append(AdbShell.disconnect());
-        // Kill the Server
-        sb.append(" - ");
-        sb.append(AdbShell.killServer());
-        // Bring it back up
-        sb.append(" - ");
-        sb.append(AdbShell.devices());
-        // Bring the shell back up
-        sb.append(" - Connect: ").append(shell.connect());
-
-        return sb.toString();
-    }
-
     public Date getLastImageDate() {
         return lastImageDate;
     }
@@ -830,13 +801,15 @@ private StateResult executableStateProcessor(Stack<ProcessingStateInfo> stateSta
                                         } else {
                                             if (!results.contains(connectionDefinition.getApp())) {
                                                 logger.error("App: " + connectionDefinition.getApp() + " is not running, will restart");
-                                                shell.exec("monkey -p " + connectionDefinition.getApp() + " -c android.intent.category.LAUNCHER 1");
+                                                shell.exec("monkey --pct-syskeys 0 -p " + connectionDefinition.getApp() +" 1");
                                             }
                                         }
                                     }
                                 } else if (StringUtils.equalsIgnoreCase(actionDefinition.getValue(), "CLOSE")) {
-                                    logger.error("Closing App: " + connectionDefinition.getApp());
-                                    shell.exec("am force-stop " + connectionDefinition.getApp());
+                                    if (StringUtils.isNotBlank(connectionDefinition.getApp())) {
+                                        logger.error("Closing App: " + connectionDefinition.getApp());
+                                        shell.exec("am force-stop " + connectionDefinition.getApp());
+                                    }
                                 }
                             } break;
                             case REFRESH: {

src/main/java/com/mgatelabs/piper/server/EditHolder.java

@@ -78,22 +78,6 @@ public AdbWrapper getShell() {
         return shell;
     }
 
-    public String restartShell() {
-        StringBuilder sb =  new StringBuilder();
-
-        sb.append(AdbShell.disconnect());
-        // Kill the Server
-        sb.append(" - ");
-        sb.append(AdbShell.killServer());
-        // Bring it back up
-        sb.append(" - ");
-        sb.append(AdbShell.devices());
-        // Bring the shell back up
-        sb.append(" - Connect: ").append(shell.connect());
-
-        return sb.toString();
-    }
-
     public ConnectionDefinition getConnectionDefinition() {
         return connectionDefinition;
     }