From c00045e1a130b1d742906a22d330ced0943e4883 Mon Sep 17 00:00:00 2001
From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com>
Date: Tue, 3 Jan 2017 18:43:59 +0100
Subject: [PATCH] 4.11c
---
app/build.gradle | 2 +-
.../consolelauncher/LauncherActivity.java | 17 ++--
.../consolelauncher/managers/AppsManager.java | 13 ++-
.../managers/MusicManager.java | 2 +-
.../managers/PreferencesManager.java | 2 +-
.../andre/consolelauncher/tuils/Tuils.java | 83 +++++++++++--------
6 files changed, 76 insertions(+), 43 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index adad8ee..44f482f 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ android {
applicationId "ohi.andre.consolelauncher"
minSdkVersion 8
targetSdkVersion 25
- versionCode 81
+ versionCode 82
versionName "4.11"
}
diff --git a/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java b/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java
index 64cdc52..e7b83b9 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java
@@ -249,12 +249,17 @@ public class LauncherActivity extends Activity implements Reloadable {
@Override
public void reload() {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
- reloadOver11();
- } else {
- finish();
- startActivity(starterIntent);
- }
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+ reloadOver11();
+ } else {
+ finish();
+ startActivity(starterIntent);
+ }
+ }
+ });
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
diff --git a/app/src/main/java/ohi/andre/consolelauncher/managers/AppsManager.java b/app/src/main/java/ohi/andre/consolelauncher/managers/AppsManager.java
index a88cdf2..dcf1d53 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/managers/AppsManager.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/managers/AppsManager.java
@@ -265,7 +265,18 @@ public class AppsManager {
}
public String[] getSuggestedApps() {
- return appsHolder.getSuggestedApps();
+// workaround
+ String[] temp = appsHolder.getSuggestedApps();
+ if(temp == null || temp.length == 0) {
+ return null;
+ }
+
+ String[] apps = new String[temp.length];
+ for(int countOnTemp = temp.length - 1, countOnApps = 0; countOnTemp >= 0 && countOnApps < apps.length; countOnApps++, countOnTemp--) {
+ apps[countOnApps] = temp[countOnTemp];
+ }
+
+ return apps;
}
public String printApps(int type) {
diff --git a/app/src/main/java/ohi/andre/consolelauncher/managers/MusicManager.java b/app/src/main/java/ohi/andre/consolelauncher/managers/MusicManager.java
index df211de..91d92b2 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/managers/MusicManager.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/managers/MusicManager.java
@@ -57,7 +57,7 @@ public class MusicManager implements OnCompletionListener {
files = Tuils.getSongsInFolder(new File(preferencesManager.getValue(PreferencesManager.SONGSFOLDER)));
}
- if(randomActive) {
+ if(randomActive && files != null) {
Collections.shuffle(files);
}
}
diff --git a/app/src/main/java/ohi/andre/consolelauncher/managers/PreferencesManager.java b/app/src/main/java/ohi/andre/consolelauncher/managers/PreferencesManager.java
index fc433cb..8edda30 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/managers/PreferencesManager.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/managers/PreferencesManager.java
@@ -180,7 +180,7 @@ public class PreferencesManager {
}
try {
- stream.write(Tuils.toPlanString(newValues, "\n").getBytes());
+ stream.write(Tuils.toPlanString(newValues, Tuils.NEWLINE).getBytes());
stream.flush();
stream.close();
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 c3923ed..4cbb977 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java
@@ -192,6 +192,10 @@ public class Tuils {
}
public static String toPlanString(String[] strings, String separator) {
+ if(strings == null) {
+ return Tuils.EMPTYSTRING;
+ }
+
String output = "";
for (int count = 0; count < strings.length; count++) {
output = output.concat(strings[count]);
@@ -202,12 +206,18 @@ public class Tuils {
}
public static String toPlanString(String[] strings) {
- return Tuils.toPlanString(strings, Tuils.NEWLINE);
+ if (strings != null) {
+ return Tuils.toPlanString(strings, Tuils.NEWLINE);
+ }
+ return Tuils.EMPTYSTRING;
}
public static String toPlanString(List<String> strings, String separator) {
- String[] object = new String[strings.size()];
- return Tuils.toPlanString(strings.toArray(object), separator);
+ if(strings != null) {
+ String[] object = new String[strings.size()];
+ return Tuils.toPlanString(strings.toArray(object), separator);
+ }
+ return Tuils.EMPTYSTRING;
}
public static String filesToPlanString(List<File> files, String separator) {
@@ -227,6 +237,10 @@ public class Tuils {
}
public static String toPlanString(Object[] objs, String separator) {
+ if(objs == null) {
+ return Tuils.EMPTYSTRING;
+ }
+
StringBuilder output = new StringBuilder();
for(int count = 0; count < objs.length; count++) {
output.append(objs[count]);
@@ -237,36 +251,39 @@ public class Tuils {
return output.toString();
}
- public static CharSequence toPlanSequence(List<CharSequence> sequences, CharSequence separator) {
- return toPlanSequence(sequences.toArray(new CharSequence[sequences.size()]), separator);
- }
-
- public static CharSequence toPlanSequence(CharSequence[] sequences, CharSequence separator) {
- if (sequences.length == 0)
- return null;
-
- CharSequence sequence = null;
- int count;
- for (count = 0; (sequence = sequences[count]) == null; count++) {
- }
-
- CharSequence output = sequences[count];
- do {
- count++;
- CharSequence current = sequences[count];
- if (current == null)
- continue;
-
- output = TextUtils.concat(output, current);
- if (count < sequences.length - 1 && !current.toString().contains(separator))
- output = TextUtils.concat(output, separator);
- } while (count + 1 < sequences.length);
- return output;
- }
-
- public static CharSequence toPlanSequence(CharSequence[] sequences) {
- return TextUtils.concat(sequences);
- }
+// public static CharSequence toPlanSequence(List<CharSequence> sequences, CharSequence separator) {
+// if(sequences != null) {
+// return toPlanSequence(sequences.toArray(new CharSequence[sequences.size()]), separator);
+// }
+// return null;
+// }
+//
+// public static CharSequence toPlanSequence(CharSequence[] sequences, CharSequence separator) {
+// if(sequences == null) {
+// return null;
+// }
+//
+// if (sequences.length == 0)
+// return null;
+//
+// CharSequence sequence = null;
+// int count;
+// for (count = 0; (sequence = sequences[count]) == null; count++) {
+// }
+//
+// CharSequence output = sequences[count];
+// do {
+// count++;
+// CharSequence current = sequences[count];
+// if (current == null)
+// continue;
+//
+// output = TextUtils.concat(output, current);
+// if (count < sequences.length - 1 && !current.toString().contains(separator))
+// output = TextUtils.concat(output, separator);
+// } while (count + 1 < sequences.length);
+// return output;
+// }
public static String removeUnncesarySpaces(String string) {
while (string.contains(DOUBLE_SPACE)) {
--
GitLab