From 7f2385b00126d08984fa70a7f65ad8d440214e4c Mon Sep 17 00:00:00 2001 From: Francesco <franzbianconero@gmail.com> Date: Sun, 22 May 2016 11:59:23 +0200 Subject: [PATCH] bugfix --- .../consolelauncher/LauncherActivity.java | 10 +++++++--- .../ohi/andre/consolelauncher/tuils/Tuils.java | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java b/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java index 6df6363..4739448 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java +++ b/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java @@ -188,8 +188,9 @@ public class LauncherActivity extends Activity implements Reloadable { protected void onStart() { super.onStart(); - if (openKeyboardOnStart) + if (ui != null && openKeyboardOnStart) { ui.onStart(); + } } @Override @@ -213,13 +214,16 @@ public class LauncherActivity extends Activity implements Reloadable { protected void onDestroy() { super.onDestroy(); - main.destroy(); + if(main != null) { + main.destroy(); + } } @Override public void onBackPressed() { - if (main != null) + if (main != null) { main.onBackPressed(); + } } @Override 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 d231bc8..22f5848 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java +++ b/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java @@ -379,12 +379,18 @@ public class Tuils { return true; } - public static String trimSpaces(String s) { - while (s.startsWith(SPACE)) - s = s.substring(1); - while (s.endsWith(SPACE)) - s = s.substring(0, s.length() - 1); - return s; + public static CharSequence trimWhitespaces(CharSequence source) { + + if(source == null) + return ""; + + int i = source.length(); + + // loop back to the first non-whitespace character + while(--i >= 0 && Character.isWhitespace(source.charAt(i))) { + } + + return source.subSequence(0, i+1); } public static String getSDK() { -- GitLab