diff --git a/app/build.gradle b/app/build.gradle index 66037ae6cde33f7aef9ba585834d6f1acf325da3..74b9d3ae2e268558b55b393fb9cf1beb80957134 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,7 +31,7 @@ android { supportBuildNumber = true buildNumberPrefix = 'b' - fileNameFormat = 't-ui-vrs_$versionName-build_$versionCode' + fileNameFormat = 't-ui-vrs_$versionName' } compileOptions { @@ -41,7 +41,7 @@ android { dependencies { compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.github.Andre1299:CompareString:1.4.1' + compile 'com.github.Andre1299:CompareString:1.4.2' compile 'commons-io:commons-io:2.4' } diff --git a/app/src/main/java/ohi/andre/consolelauncher/MainManager.java b/app/src/main/java/ohi/andre/consolelauncher/MainManager.java index 19a3e812979c11361925859bad996ef1734068bc..1c377ff5be900853f16f56fcdde77a30a40247ec 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/MainManager.java +++ b/app/src/main/java/ohi/andre/consolelauncher/MainManager.java @@ -4,6 +4,7 @@ import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.util.Log; import java.util.ArrayList; import java.util.List; @@ -103,10 +104,16 @@ public class MainManager { lastCommands.add(input); lastCommandIndex = lastCommands.size() - 1; + Log.e("andre", "5"); + input = input.trim(); input = Tuils.removeUnncesarySpaces(input); + Log.e("andre", "6"); + Log.e("andre", input); + for (CmdTrigger trigger : triggers) { + Log.e("andre", trigger.toString()); boolean r; try { r = trigger.trigger(info, out, input, id); @@ -114,8 +121,13 @@ public class MainManager { out.onOutput(Tuils.getStackTrace(e), id); return; } - if (r) + Log.e("andre", String.valueOf(r)); + if (r) { + Log.e("andre", trigger.toString()); return; + } else { + Log.e("andre", trigger.toString()); + } } } diff --git a/app/src/main/java/ohi/andre/consolelauncher/UIManager.java b/app/src/main/java/ohi/andre/consolelauncher/UIManager.java index 5fe24ff20c8f5b6992b053f593d8e43d219182df..4ecc19aadefaa6b72df5f2054746cb69dac5fc6a 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/UIManager.java +++ b/app/src/main/java/ohi/andre/consolelauncher/UIManager.java @@ -256,8 +256,8 @@ public class UIManager implements OnTouchListener { mTerminalAdapter.setInputListener(new OnNewInputListener() { @Override public void onNewInput(String input) { - trigger.exec(input, mTerminalAdapter.getCurrentOutputId()); suggestionsView.removeAllViews(); + trigger.exec(input, mTerminalAdapter.getCurrentOutputId()); } }); diff --git a/app/src/main/java/ohi/andre/consolelauncher/tuils/TerminalAdapter.java b/app/src/main/java/ohi/andre/consolelauncher/tuils/TerminalAdapter.java index fbbf67c5c64a0877839569cc274bd4e951d95e02..c23c2c56135d42d9b4f5cd460a0241f04a3b1eb7 100644 --- a/app/src/main/java/ohi/andre/consolelauncher/tuils/TerminalAdapter.java +++ b/app/src/main/java/ohi/andre/consolelauncher/tuils/TerminalAdapter.java @@ -296,9 +296,14 @@ public class TerminalAdapter { } public void clear() { - mTerminalView.setText(Tuils.EMPTYSTRING); - mInputView.setText(Tuils.EMPTYSTRING); - mCurrentOutputId = 0; + ((Activity) mTerminalView.getContext()).runOnUiThread(new Runnable() { + @Override + public void run() { + mTerminalView.setText(Tuils.EMPTYSTRING); + mInputView.setText(Tuils.EMPTYSTRING); + mCurrentOutputId = 0; + } + }); } } diff --git a/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java b/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java index 22f5848404283da96a7134affd04819765d63457..7c92d317536a21c0919e76b6d5580255d3522015 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java +++ b/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java @@ -150,10 +150,15 @@ public class Tuils { } @SuppressWarnings("unchecked") - public static CommandAbstraction getCommandInstance(String cmdName) throws Exception { - Class<CommandAbstraction> clazz = (Class<CommandAbstraction>) Class.forName(cmdName); - Constructor<?> ctor = clazz.getConstructor(); - return (CommandAbstraction) ctor.newInstance(); + public static CommandAbstraction getCommandInstance(String cmdName) { + Class<CommandAbstraction> clazz; + try { + clazz = (Class<CommandAbstraction>) Class.forName(cmdName); + Constructor<?> constructor = clazz.getConstructor(); + return (CommandAbstraction) constructor.newInstance(); + } catch (Exception e) { + return null; + } } public static int findPrefix(List<String> list, String prefix) { @@ -163,14 +168,6 @@ public class Tuils { return -1; } - public static int count(String string, String toCount) { - return string.length() - string.replaceAll(toCount, "").length(); - } - - public static int count(CharSequence[] sequences, String toCount) { - return count(toPlanSequence(sequences).toString(), toCount); - } - public static boolean verifyRoot() { Process p; try { @@ -232,7 +229,7 @@ public class Tuils { } public static String toPlanString(String[] strings) { - return Tuils.toPlanString(strings, "\n"); + return Tuils.toPlanString(strings, Tuils.NEWLINE); } public static String toPlanString(List<String> strings, String separator) {