Skip to content
Snippets Groups Projects
Commit ae55d1ad authored by Francesco's avatar Francesco
Browse files

bugfix

parent fdbe7beb
No related branches found
No related tags found
No related merge requests found
...@@ -31,7 +31,7 @@ android { ...@@ -31,7 +31,7 @@ android {
supportBuildNumber = true supportBuildNumber = true
buildNumberPrefix = 'b' buildNumberPrefix = 'b'
fileNameFormat = 't-ui-vrs_$versionName-build_$versionCode' fileNameFormat = 't-ui-vrs_$versionName'
} }
compileOptions { compileOptions {
...@@ -41,7 +41,7 @@ android { ...@@ -41,7 +41,7 @@ android {
dependencies { dependencies {
compile 'com.android.support:appcompat-v7:23.4.0' 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' compile 'commons-io:commons-io:2.4'
} }
......
...@@ -4,6 +4,7 @@ import android.app.admin.DevicePolicyManager; ...@@ -4,6 +4,7 @@ import android.app.admin.DevicePolicyManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.util.Log;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -103,10 +104,16 @@ public class MainManager { ...@@ -103,10 +104,16 @@ public class MainManager {
lastCommands.add(input); lastCommands.add(input);
lastCommandIndex = lastCommands.size() - 1; lastCommandIndex = lastCommands.size() - 1;
Log.e("andre", "5");
input = input.trim(); input = input.trim();
input = Tuils.removeUnncesarySpaces(input); input = Tuils.removeUnncesarySpaces(input);
Log.e("andre", "6");
Log.e("andre", input);
for (CmdTrigger trigger : triggers) { for (CmdTrigger trigger : triggers) {
Log.e("andre", trigger.toString());
boolean r; boolean r;
try { try {
r = trigger.trigger(info, out, input, id); r = trigger.trigger(info, out, input, id);
...@@ -114,8 +121,13 @@ public class MainManager { ...@@ -114,8 +121,13 @@ public class MainManager {
out.onOutput(Tuils.getStackTrace(e), id); out.onOutput(Tuils.getStackTrace(e), id);
return; return;
} }
if (r) Log.e("andre", String.valueOf(r));
if (r) {
Log.e("andre", trigger.toString());
return; return;
} else {
Log.e("andre", trigger.toString());
}
} }
} }
......
...@@ -256,8 +256,8 @@ public class UIManager implements OnTouchListener { ...@@ -256,8 +256,8 @@ public class UIManager implements OnTouchListener {
mTerminalAdapter.setInputListener(new OnNewInputListener() { mTerminalAdapter.setInputListener(new OnNewInputListener() {
@Override @Override
public void onNewInput(String input) { public void onNewInput(String input) {
trigger.exec(input, mTerminalAdapter.getCurrentOutputId());
suggestionsView.removeAllViews(); suggestionsView.removeAllViews();
trigger.exec(input, mTerminalAdapter.getCurrentOutputId());
} }
}); });
......
...@@ -296,9 +296,14 @@ public class TerminalAdapter { ...@@ -296,9 +296,14 @@ public class TerminalAdapter {
} }
public void clear() { public void clear() {
((Activity) mTerminalView.getContext()).runOnUiThread(new Runnable() {
@Override
public void run() {
mTerminalView.setText(Tuils.EMPTYSTRING); mTerminalView.setText(Tuils.EMPTYSTRING);
mInputView.setText(Tuils.EMPTYSTRING); mInputView.setText(Tuils.EMPTYSTRING);
mCurrentOutputId = 0; mCurrentOutputId = 0;
} }
});
}
} }
...@@ -150,10 +150,15 @@ public class Tuils { ...@@ -150,10 +150,15 @@ public class Tuils {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static CommandAbstraction getCommandInstance(String cmdName) throws Exception { public static CommandAbstraction getCommandInstance(String cmdName) {
Class<CommandAbstraction> clazz = (Class<CommandAbstraction>) Class.forName(cmdName); Class<CommandAbstraction> clazz;
Constructor<?> ctor = clazz.getConstructor(); try {
return (CommandAbstraction) ctor.newInstance(); 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) { public static int findPrefix(List<String> list, String prefix) {
...@@ -163,14 +168,6 @@ public class Tuils { ...@@ -163,14 +168,6 @@ public class Tuils {
return -1; 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() { public static boolean verifyRoot() {
Process p; Process p;
try { try {
...@@ -232,7 +229,7 @@ public class Tuils { ...@@ -232,7 +229,7 @@ public class Tuils {
} }
public static String toPlanString(String[] strings) { 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) { public static String toPlanString(List<String> strings, String separator) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment