From 5d894cc07cfee3e9531e7f7964328b4759df6626 Mon Sep 17 00:00:00 2001
From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com>
Date: Thu, 16 Jun 2016 15:18:47 +0200
Subject: [PATCH] updated
---
app/build.gradle | 4 ++--
app/src/main/AndroidManifest.xml | 1 -
.../andre/consolelauncher/MainManager.java | 19 +++++++++----------
.../consolelauncher/commands/raw/apps.java | 9 +++++----
.../consolelauncher/commands/raw/help.java | 3 ++-
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 2c42231..63f0c04 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
applicationId "ohi.andre.consolelauncher"
minSdkVersion 8
targetSdkVersion 23
- versionCode 70
- versionName "4.3"
+ versionCode 72
+ versionName "4.4"
}
buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1dea93d..eded6f3 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,7 +42,6 @@
<!-- t-ui -->
<application
- android:name=".TUIApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
diff --git a/app/src/main/java/ohi/andre/consolelauncher/MainManager.java b/app/src/main/java/ohi/andre/consolelauncher/MainManager.java
index 2555c58..a96bd15 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/MainManager.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/MainManager.java
@@ -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);
diff --git a/app/src/main/java/ohi/andre/consolelauncher/commands/raw/apps.java b/app/src/main/java/ohi/andre/consolelauncher/commands/raw/apps.java
index 557e18b..1465bd1 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/commands/raw/apps.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/commands/raw/apps.java
@@ -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
diff --git a/app/src/main/java/ohi/andre/consolelauncher/commands/raw/help.java b/app/src/main/java/ohi/andre/consolelauncher/commands/raw/help.java
index d3f82f3..7c1ab1f 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/commands/raw/help.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/commands/raw/help.java
@@ -1,6 +1,7 @@
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
--
GitLab