Skip to content
Snippets Groups Projects
Commit 5d894cc0 authored by Francesco Andreuzzi's avatar Francesco Andreuzzi
Browse files

updated

parent c69af1f4
Branches
Tags
No related merge requests found
......@@ -13,8 +13,8 @@ android {
applicationId "ohi.andre.consolelauncher"
minSdkVersion 8
targetSdkVersion 23
versionCode 70
versionName "4.3"
versionCode 72
versionName "4.4"
}
buildTypes {
......
......@@ -42,7 +42,6 @@
<!-- t-ui -->
<application
android:name=".TUIApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
......
......@@ -53,11 +53,9 @@ public class MainManager {
private Context mContext;
// interfaces
private Inputable in;
private Outputable out;
// last commands
private List<String> lastCommands;
private int lastCommandIndex;
......@@ -88,7 +86,7 @@ public class MainManager {
MusicManager music = new MusicManager(mContext, prefsMgr);
AppsManager appsMgr = new AppsManager(c);
AppsManager appsMgr = new AppsManager(c, Boolean.parseBoolean(prefsMgr.getValue(PreferencesManager.COMPARESTRING_APPS)));
AliasManager aliasManager = new AliasManager(prefsMgr);
info = new ExecInfo(mContext, prefsMgr, group, aliasManager, appsMgr, music, cont, devicePolicyManager, componentName,
......@@ -116,8 +114,7 @@ public class MainManager {
}
if (r) {
return;
} else {
}
} else {}
}
}
......@@ -127,13 +124,13 @@ public class MainManager {
if (lastCommands.size() > 0 && lastCommandIndex < lastCommands.size() && lastCommandIndex >= 0)
s = lastCommands.get(lastCommandIndex--);
else
s = "";
s = Tuils.EMPTYSTRING;
in.in(s);
}
public void onLongBack() {
in.in("");
in.in(Tuils.EMPTYSTRING);
}
// dispose
......@@ -212,13 +209,15 @@ public class MainManager {
@Override
public boolean trigger(ExecInfo info, Outputable out, String input, int id) {
String packageName = info.appsManager.findPackage(info.appsManager.getApps(), input);
if (packageName == null)
String packageName = info.appsManager.findPackage(input, AppsManager.SHOWN_APPS);
if (packageName == null) {
return false;
}
Intent intent = info.appsManager.getIntent(packageName);
if (intent == null)
if (intent == null) {
return false;
}
out.onOutput(info.res.getString(R.string.starting_app) + Tuils.SPACE + intent.getComponent().getClassName(), id);
......
......@@ -6,6 +6,7 @@ import android.content.SharedPreferences;
import ohi.andre.consolelauncher.R;
import ohi.andre.consolelauncher.commands.CommandAbstraction;
import ohi.andre.consolelauncher.commands.ExecInfo;
import ohi.andre.consolelauncher.managers.AppsManager;
public class apps implements CommandAbstraction {
......@@ -30,7 +31,7 @@ public class apps implements CommandAbstraction {
private String hideApp(ExecInfo info, String app) {
SharedPreferences.Editor editor = ((Activity) info.context).getPreferences(0).edit();
String result = info.appsManager.hideApp(editor, app);
String result = info.appsManager.hideApp(app);
if (result != null) {
editor.commit();
return result + " " + info.res.getString(R.string.output_hideapp);
......@@ -40,7 +41,7 @@ public class apps implements CommandAbstraction {
private String unHideApp(ExecInfo info, String app) {
SharedPreferences.Editor editor = ((Activity) info.context).getPreferences(0).edit();
String result = info.appsManager.unhideApp(editor, app);
String result = info.appsManager.unhideApp(app);
if (result != null) {
editor.commit();
return result + " " + info.res.getString(R.string.output_unhideapp);
......@@ -49,7 +50,7 @@ public class apps implements CommandAbstraction {
}
private String showHiddenApps(ExecInfo info) {
return info.appsManager.printHiddenApps();
return info.appsManager.printApps(AppsManager.HIDDEN_APPS);
}
@Override
......@@ -94,7 +95,7 @@ public class apps implements CommandAbstraction {
else
return info.res.getString(helpRes());
} else
return info.appsManager.printApps();
return info.appsManager.printApps(AppsManager.SHOWN_APPS);
}
@Override
......
package ohi.andre.consolelauncher.commands.raw;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
......@@ -52,7 +53,7 @@ public class help implements CommandAbstraction {
@Override
public String onNotArgEnough(ExecInfo info, int nArgs) {
List<String> toPrint = new ArrayList<>(info.commandGroup.getCommands());
List<String> toPrint = new ArrayList<>(Arrays.asList(info.commandGroup.getCommandNames()));
Collections.sort(toPrint, new Comparator<String>() {
@Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment