Avoid unnecessary use of startsWith.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryApplication.java

diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index 6d125830d8a77b5295338d3e0ba7007e568ad84a..a11fc1e54ac5e50630a687e1a5e64efceb36dfd2 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -72,6 +72,15 @@ public class DictionaryApplication extends Application {
     //static public final boolean USE_COLLATOR = !android.os.Build.FINGERPRINT.equals("Samsung/cm_tassve/tassve:4.4.4/KTU84Q/20150211:userdebug/release-keys");
     static public final boolean USE_COLLATOR = true;
 
+    static public final TransliteratorManager.ThreadSetup threadBackground = new TransliteratorManager.ThreadSetup() {
+        @Override
+        public void onThreadStart() {
+            // THREAD_PRIORITY_BACKGROUND seemed like a good idea, but it
+            // can make Transliterator go from 20 seconds to 3 minutes (!)
+            android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_LESS_FAVORABLE);
+        }
+    };
+
     // Static, determined by resources (and locale).
     // Unordered.
     static Map<String, DictionaryInfo> DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO = null;
@@ -307,7 +316,7 @@ public class DictionaryApplication extends Application {
         try {
             String line;
             while ((line = reader.readLine()) != null) {
-                if (line.startsWith("#") || line.length() == 0) {
+                if (line.length() == 0 || line.charAt(0) == '#') {
                     continue;
                 }
                 final DictionaryInfo dictionaryInfo = new DictionaryInfo(line);
@@ -328,7 +337,7 @@ public class DictionaryApplication extends Application {
     public void onCreate() {
         super.onCreate();
         Log.d("QuickDic", "Application: onCreate");
-        TransliteratorManager.init(null);
+        TransliteratorManager.init(null, threadBackground);
         staticInit(getApplicationContext());
 
         languageButtonPixels = (int) TypedValue.applyDimension(
@@ -487,10 +496,17 @@ public class DictionaryApplication extends Application {
     final Map<String, String> fileToNameCache = new HashMap<String, String>();
 
     public String isoCodeToLocalizedLanguageName(final String isoCode) {
+        String lang = new Locale(isoCode).getDisplayLanguage();
+        if (!lang.equals("") && !lang.equals(isoCode))
+        {
+            return lang;
+        }
         final Language.LanguageResources languageResources = isoCodeToResources
                 .get(isoCode);
-        final String lang = languageResources != null ? getApplicationContext().getString(
-                                languageResources.nameId) : isoCode;
+        if (languageResources != null)
+        {
+            lang = getApplicationContext().getString(languageResources.nameId);
+        }
         return lang;
     }