]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/DictionaryApplication.java
Switch to app compat preferences.
[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryApplication.java
index 53cbd0a451511061a6349780d0efe8be9e7265c0..1e3788be869e7d830511705e391282e1af33c0ca 100644 (file)
 
 package com.hughes.android.dictionary;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.net.Uri;
-import android.preference.PreferenceManager;
+import android.os.Build;
+import android.os.Environment;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v4.view.MenuItemCompat;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
 
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
 import com.hughes.android.dictionary.engine.Dictionary;
-import com.hughes.android.dictionary.engine.Language;
 import com.hughes.android.dictionary.engine.TransliteratorManager;
 import com.hughes.android.util.PersistentObjectCache;
-import com.ibm.icu.text.Collator;
-
-public class DictionaryApplication extends Application {
-  
-  static final String LOG = "QuickDicApp";
-  
-  // Static, determined by resources (and locale).
-  // Unordered.
-  static Map<String,DictionaryInfo> DOWNLOADABLE_NAME_TO_INFO = null;
-  
-  static final class DictionaryConfig implements Serializable {
-    private static final long serialVersionUID = -1444177164708201263L;
-    // User-ordered list, persisted, just the ones that are/have been present.
-    final List<String> dictionaryFilesOrdered = new ArrayList<String>();
-    final Map<String, DictionaryInfo> dictionaryInfoCache = new LinkedHashMap<String, DictionaryInfo>();
-  }
-  DictionaryConfig dictionaryConfig = null;
-
-  static final class DictionaryHistory implements Serializable {
-    private static final long serialVersionUID = -4842995032541390284L;
-    // User-ordered list, persisted, just the ones that are/have been present.
-    final List<DictionaryLink> dictionaryLinks = new ArrayList<DictionaryLink>();
-  }
-  DictionaryHistory dictionaryHistory = null;
-  
-  private File dictDir;
-
-  static synchronized void staticInit(final Context context) {
-    if (DOWNLOADABLE_NAME_TO_INFO != null) {
-      return;
+import com.hughes.util.ListUtil;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+public enum DictionaryApplication {
+    INSTANCE;
+
+    private Context appContext;
+
+    static final String LOG = "QuickDicApp";
+
+    // If set to false, avoid use of ICU collator
+    // Works well enough for most european languages,
+    // gives faster startup and avoids crashes on some
+    // devices due to Dalvik bugs (e.g. ARMv6, S5570i, CM11)
+    // when using ICU4J.
+    // Leave it enabled by default for correctness except
+    // for my known broken development/performance test device config.
+    //static public final boolean USE_COLLATOR = !android.os.Build.FINGERPRINT.equals("Samsung/cm_tassve/tassve:4.4.4/KTU84Q/20150211:userdebug/release-keys");
+    public static final boolean USE_COLLATOR = true;
+
+    public static 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;
+
+    enum Theme {
+        DEFAULT(R.style.Theme_Default,
+        R.style.Theme_Default_TokenRow_Fg,
+        R.color.theme_default_token_row_fg,
+        R.drawable.theme_default_token_row_main_bg,
+        R.drawable.theme_default_token_row_other_bg,
+        R.drawable.theme_default_normal_row_bg),
+
+        LIGHT(R.style.Theme_Light,
+        R.style.Theme_Light_TokenRow_Fg,
+        R.color.theme_light_token_row_fg,
+        R.drawable.theme_light_token_row_main_bg,
+        R.drawable.theme_light_token_row_other_bg,
+        R.drawable.theme_light_normal_row_bg);
+
+        Theme(final int themeId, final int tokenRowFg,
+        final int tokenRowFgColor,
+        final int tokenRowMainBg, final int tokenRowOtherBg,
+        final int normalRowBg) {
+            this.themeId = themeId;
+            this.tokenRowFg = tokenRowFg;
+            this.tokenRowFgColor = tokenRowFgColor;
+            this.tokenRowMainBg = tokenRowMainBg;
+            this.tokenRowOtherBg = tokenRowOtherBg;
+            this.normalRowBg = normalRowBg;
+        }
+
+        final int themeId;
+        final int tokenRowFg;
+        final int tokenRowFgColor;
+        final int tokenRowMainBg;
+        final int tokenRowOtherBg;
+        final int normalRowBg;
+    }
+
+    public static final class DictionaryConfig implements Serializable {
+        private static final long serialVersionUID = -1444177164708201263L;
+        // User-ordered list, persisted, just the ones that are/have been
+        // present.
+        final List<String> dictionaryFilesOrdered = new ArrayList<>();
+
+        final Map<String, DictionaryInfo> uncompressedFilenameToDictionaryInfo = new HashMap<>();
+
+        /**
+         * Sometimes a deserialized version of this data structure isn't valid.
+         */
+        @SuppressWarnings("ConstantConditions")
+        boolean isValid() {
+            return uncompressedFilenameToDictionaryInfo != null && dictionaryFilesOrdered != null;
+        }
+    }
+
+    DictionaryConfig dictionaryConfig = null;
+
+    public int languageButtonPixels = -1;
+
+    static synchronized void staticInit(final Context context) {
+        if (DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO != null) {
+            return;
+        }
+        DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO = new HashMap<>();
+        final BufferedReader reader = new BufferedReader(
+            new InputStreamReader(context.getResources().openRawResource(R.raw.dictionary_info)));
+        try {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (line.length() == 0 || line.charAt(0) == '#') {
+                    continue;
+                }
+                final DictionaryInfo dictionaryInfo = new DictionaryInfo(line);
+                DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO.put(
+                    dictionaryInfo.uncompressedFilename, dictionaryInfo);
+            }
+        } catch (IOException e) {
+            Log.e(LOG, "Failed to load downloadable dictionary lists.", e);
+        }
+        try {
+            reader.close();
+        } catch (IOException ignored) {}
+    }
+
+    public synchronized void init(Context c) {
+        if (appContext != null) {
+            assert c == appContext;
+            return;
+        }
+        appContext = c;
+        Log.d("QuickDic", "Application: onCreate");
+        TransliteratorManager.init(null, threadBackground);
+        staticInit(appContext);
+
+        languageButtonPixels = (int) TypedValue.applyDimension(
+                                   TypedValue.COMPLEX_UNIT_DIP, 60, appContext.getResources().getDisplayMetrics());
+
+        // Load the dictionaries we know about.
+        dictionaryConfig = PersistentObjectCache.init(appContext).read(
+                               C.DICTIONARY_CONFIGS, DictionaryConfig.class);
+        if (dictionaryConfig == null) {
+            dictionaryConfig = new DictionaryConfig();
+        }
+        if (!dictionaryConfig.isValid()) {
+            dictionaryConfig = new DictionaryConfig();
+        }
+
+        // Theme stuff.
+        appContext.setTheme(getSelectedTheme().themeId);
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
+        prefs.registerOnSharedPreferenceChangeListener(new OnSharedPreferenceChangeListener() {
+            @Override
+            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+                                                  String key) {
+                Log.d("QuickDic", "prefs changed: " + key);
+                if (key.equals(appContext.getString(R.string.themeKey))) {
+                    appContext.setTheme(getSelectedTheme().themeId);
+                }
+            }
+        });
+    }
+
+    public static void onCreateGlobalOptionsMenu(
+        final Context context, final Menu menu) {
+        final Context c = context.getApplicationContext();
+
+        final MenuItem preferences = menu.add(c.getString(R.string.settings));
+        MenuItemCompat.setShowAsAction(preferences, MenuItem.SHOW_AS_ACTION_NEVER);
+        preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+            public boolean onMenuItemClick(final MenuItem menuItem) {
+                PreferenceActivity.prefsMightHaveChanged = true;
+                final Intent intent = new Intent(c, PreferenceActivity.class);
+                context.startActivity(intent);
+                return false;
+            }
+        });
+
+        final MenuItem help = menu.add(c.getString(R.string.help));
+        MenuItemCompat.setShowAsAction(help, MenuItem.SHOW_AS_ACTION_NEVER);
+        help.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+            public boolean onMenuItemClick(final MenuItem menuItem) {
+                context.startActivity(HtmlDisplayActivity.getHelpLaunchIntent(c));
+                return false;
+            }
+        });
+
+        final MenuItem reportIssue = menu.add(c.getString(R.string.reportIssue));
+        MenuItemCompat.setShowAsAction(reportIssue, MenuItem.SHOW_AS_ACTION_NEVER);
+        reportIssue.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+            public boolean onMenuItemClick(final MenuItem menuItem) {
+                final Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri
+                               .parse("https://github.com/rdoeffinger/Dictionary/issues"));
+                context.startActivity(intent);
+                return false;
+            }
+        });
+
+        final MenuItem about = menu.add(c.getString(R.string.about));
+        MenuItemCompat.setShowAsAction(about, MenuItem.SHOW_AS_ACTION_NEVER);
+        about.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+            public boolean onMenuItemClick(final MenuItem menuItem) {
+                final Intent intent = new Intent(c, AboutActivity.class);
+                context.startActivity(intent);
+                return false;
+            }
+        });
     }
-    DOWNLOADABLE_NAME_TO_INFO = new LinkedHashMap<String,DictionaryInfo>();
-    final BufferedReader reader = new BufferedReader(new InputStreamReader(context.getResources().openRawResource(R.raw.dictionary_info)));
-    try {
-      String line;
-      while ((line = reader.readLine()) != null) {
-        if (line.startsWith("#") || line.length() == 0) {
-          continue;
+
+    private String selectDefaultDir() {
+        final File defaultDictDir = new File(Environment.getExternalStorageDirectory(), "quickDic");
+        String dir = defaultDictDir.getAbsolutePath();
+        File dictDir = new File(dir);
+        String[] fileList = dictDir.isDirectory() ? dictDir.list() : null;
+        if (fileList != null && fileList.length > 0) {
+            return dir;
+        }
+        File efd = null;
+        try {
+            efd = appContext.getExternalFilesDir(null);
+        } catch (Exception ignored) {
+        }
+        if (efd != null) {
+            efd.mkdirs();
+            if (!dictDir.isDirectory() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                appContext.getExternalFilesDirs(null);
+            }
+            if (efd.isDirectory() && efd.canWrite() && checkFileCreate(efd)) {
+                return efd.getAbsolutePath();
+            }
         }
-        final DictionaryInfo dictionaryInfo = new DictionaryInfo(line);
-        DOWNLOADABLE_NAME_TO_INFO.put(dictionaryInfo.uncompressedFilename, dictionaryInfo);
-      }
-      reader.close();
-    } catch (IOException e) {
-      Log.e(LOG, "Failed to load downloadable dictionary lists.", e);
+        if (!dictDir.isDirectory() && !dictDir.mkdirs()) {
+            return appContext.getFilesDir().getAbsolutePath();
+        }
+        return dir;
     }
-  }
-
-  
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    Log.d("QuickDic", "Application: onCreate");
-    TransliteratorManager.init(null);
-    staticInit(getApplicationContext());
-    
-    // Load the dictionaries we know about.
-    dictionaryConfig = PersistentObjectCache.init(getApplicationContext()).read(C.DICTIONARY_CONFIGS, DictionaryConfig.class);
-    if (dictionaryConfig == null) {
-      dictionaryConfig = new DictionaryConfig();
+
+    public synchronized File getDictDir() {
+        // This metaphor doesn't work, because we've already reset
+        // prefsMightHaveChanged.
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
+        String dir = prefs.getString(appContext.getString(R.string.quickdicDirectoryKey), "");
+        if (dir.isEmpty()) {
+            dir = selectDefaultDir();
+        }
+        File dictDir = new File(dir);
+        dictDir.mkdirs();
+        if (!dictDir.isDirectory() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            appContext.getExternalFilesDirs(null);
+        }
+        return dictDir;
     }
-    
-    // Theme stuff.
-    setTheme(getSelectedTheme().themeId);
-    final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-    prefs.registerOnSharedPreferenceChangeListener(new OnSharedPreferenceChangeListener() {
-      @Override
-      public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
-          String key) {
-        Log.d("THAD", "prefs changed: " + key);
-        if (key.equals(getString(R.string.themeKey))) {
-          setTheme(getSelectedTheme().themeId);
+
+    public static boolean checkFileCreate(File dir) {
+        boolean res = false;
+        File testfile = new File(dir, "quickdic_writetest");
+        try {
+            testfile.delete();
+            res = testfile.createNewFile() & testfile.delete();
+        } catch (Exception ignored) {
         }
-      }
-    });
-  }
-  
-  public void onCreateGlobalOptionsMenu(
-      final Context context, final Menu menu) {
-    final MenuItem about = menu.add(getString(R.string.about));
-    about.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        final Intent intent = new Intent().setClassName(AboutActivity.class
-            .getPackage().getName(), AboutActivity.class.getCanonicalName());
-        context.startActivity(intent);
-        return false;
-      }
-    });
-
-    final MenuItem help = menu.add(getString(R.string.help));
-    help.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        context.startActivity(HelpActivity.getLaunchIntent());
-        return false;
-      }
-    });
-
-    final MenuItem preferences = menu.add(getString(R.string.preferences));
-    preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        PreferenceActivity.prefsMightHaveChanged = true;
-        final Intent intent = new Intent().setClassName(PreferenceActivity.class
-            .getPackage().getName(), PreferenceActivity.class.getCanonicalName());
-        context.startActivity(intent);
-        return false;
-      }
-    });
-    
-    
-    final MenuItem reportIssue = menu.add(getString(R.string.reportIssue));
-    reportIssue.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        final Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setData(Uri.parse("http://code.google.com/p/quickdic-dictionary/issues/entry"));
-        context.startActivity(intent);
-        return false;
-      }
-    });
-  }
-  
-  public synchronized File getDictDir() {
-    // This metaphore doesn't work, because we've already reset prefsMightHaveChanged.
-//    if (dictDir == null || PreferenceActivity.prefsMightHaveChanged) {
-      final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-      final String dir = prefs.getString(getString(R.string.quickdicDirectoryKey), getString(R.string.quickdicDirectoryDefault));
-      dictDir = new File(dir);
-      dictDir.mkdirs();
-//    }
-    return dictDir;
-  }
-  
-  public C.Theme getSelectedTheme() {
-    final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-    final String theme = prefs.getString(getString(R.string.themeKey), "themeLight");
-    if (theme.equals("themeLight")) {
-      return C.Theme.LIGHT;
-    } else {
-      return C.Theme.DEFAULT;
+        return res;
     }
-  }
-    
-  public File getPath(String uncompressedFilename) {
-    return new File(getDictDir(), uncompressedFilename);
-  }
-  
-  
-  final Map<String, String> fileToNameCache = new LinkedHashMap<String, String>();
-
-  public String getLanguageName(final String isoCode) {
-    final Language.LanguageResources languageResources = Language.isoCodeToResources.get(isoCode); 
-    final String lang = languageResources != null ? getApplicationContext().getString(languageResources.nameId) : isoCode;
-    return lang;
-  }
-
-  public synchronized String getDictionaryName(final String uncompressedFilename) {
-    String name = fileToNameCache.get(uncompressedFilename);
-    if (name != null) {
-      return name;
+
+    public File getWordListFile() {
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
+        String file = prefs.getString(appContext.getString(R.string.wordListFileKey), "");
+        if (file.isEmpty()) {
+            return new File(getDictDir(), "wordList.txt");
+        }
+        return new File(file);
     }
-    
-    final DictionaryInfo dictionaryInfo = DOWNLOADABLE_NAME_TO_INFO.get(uncompressedFilename);
-    if (dictionaryInfo != null) {
-      final StringBuilder nameBuilder = new StringBuilder();
-      for (int i = 0; i < dictionaryInfo.indexInfos.size(); ++i) {
-        if (i > 0) {
-          nameBuilder.append("-");
+
+    public Theme getSelectedTheme() {
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
+        final String theme = prefs.getString(appContext.getString(R.string.themeKey), "themeLight");
+        if (theme.equals("themeLight")) {
+            return Theme.LIGHT;
+        } else {
+            return Theme.DEFAULT;
         }
-        nameBuilder.append(getLanguageName(dictionaryInfo.indexInfos.get(i).shortName));
-      }
-      name = nameBuilder.toString();
-    } else {
-      name = uncompressedFilename.replace(".quickdic", "");
     }
-    fileToNameCache.put(uncompressedFilename, name);
-    return name;
-  }
-
-  public synchronized void moveDictionaryToTop(final DictionaryInfo dictionaryInfo) {
-    dictionaryConfig.dictionaryFilesOrdered.remove(dictionaryInfo.uncompressedFilename);
-    dictionaryConfig.dictionaryFilesOrdered.add(0, dictionaryInfo.uncompressedFilename);
-    PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig);
-  }
-
-  public synchronized void deleteDictionary(final DictionaryInfo dictionaryInfo) {
-    while (dictionaryConfig.dictionaryFilesOrdered.remove(dictionaryInfo.uncompressedFilename)) {};
-    dictionaryConfig.dictionaryInfoCache.remove(dictionaryInfo.uncompressedFilename);
-    getPath(dictionaryInfo.uncompressedFilename).delete();
-    PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig);
-  }
-
-  final Collator collator = Collator.getInstance();
-  final Comparator<String> uncompressedFilenameComparator = new Comparator<String>() {
-    @Override
-    public int compare(String uncompressedFilename1, String uncompressedFilename2) {
-      return collator.compare(getDictionaryName(uncompressedFilename1), getDictionaryName(uncompressedFilename2));
+
+    public File getPath(String uncompressedFilename) {
+        return new File(getDictDir(), uncompressedFilename);
     }
-  };
-  final Comparator<DictionaryInfo> dictionaryInfoComparator = new Comparator<DictionaryInfo>() {
-    @Override
-    public int compare(DictionaryInfo d1, DictionaryInfo d2) {
-      return uncompressedFilenameComparator.compare(d1.uncompressedFilename, d2.uncompressedFilename);
+
+    String defaultLangISO2 = Locale.getDefault().getLanguage().toLowerCase();
+    String defaultLangName = null;
+    final Map<String, String> fileToNameCache = new HashMap<>();
+
+    public List<IndexInfo> sortedIndexInfos(List<IndexInfo> indexInfos) {
+        // Hack to put the default locale first in the name.
+        if (indexInfos.size() > 1 &&
+                indexInfos.get(1).shortName.toLowerCase().equals(defaultLangISO2)) {
+            List<IndexInfo> result = new ArrayList<>(indexInfos);
+            ListUtil.swap(result, 0, 1);
+            return result;
+        }
+        return indexInfos;
     }
-  };
-  
-  public void backgroundUpdateDictionaries(final Runnable onUpdateFinished) {
-    new Thread(new Runnable() {
-      @Override
-      public void run() {
-        final DictionaryConfig oldDictionaryConfig = new DictionaryConfig();
-        synchronized(this) {
-          oldDictionaryConfig.dictionaryFilesOrdered.addAll(dictionaryConfig.dictionaryFilesOrdered);
+
+    public synchronized String getDictionaryName(final String uncompressedFilename) {
+        final String currentLocale = Locale.getDefault().getLanguage().toLowerCase();
+        if (!currentLocale.equals(defaultLangISO2)) {
+            defaultLangISO2 = currentLocale;
+            fileToNameCache.clear();
+            defaultLangName = null;
+        }
+        if (defaultLangName == null) {
+            defaultLangName = IsoUtils.INSTANCE.isoCodeToLocalizedLanguageName(appContext, defaultLangISO2);
         }
-        final DictionaryConfig newDictionaryConfig = new DictionaryConfig();
-        for (final String uncompressedFilename : oldDictionaryConfig.dictionaryFilesOrdered) {
-          final File dictFile = getPath(uncompressedFilename);
-          final DictionaryInfo dictionaryInfo = Dictionary.getDictionaryInfo(dictFile);
-          if (dictionaryInfo != null) {
-            newDictionaryConfig.dictionaryFilesOrdered.add(uncompressedFilename);
-            newDictionaryConfig.dictionaryInfoCache.put(uncompressedFilename, dictionaryInfo);
-          }
+
+        String name = fileToNameCache.get(uncompressedFilename);
+        if (name != null) {
+            return name;
         }
-        
-        // Are there dictionaries on the device that we didn't know about already?
-        // Pick them up and put them at the end of the list.
-        final List<String> toAddSorted = new ArrayList<String>();
-        final File[] dictDirFiles = getDictDir().listFiles();
-        if (dictDirFiles != null) {
-          for (final File file : dictDirFiles) {
-            if (file.getName().endsWith(".zip")) {
-              if (DOWNLOADABLE_NAME_TO_INFO.containsKey(file.getName().replace(".zip", ""))) {
-                file.delete();
-              }
+
+        final DictionaryInfo dictionaryInfo = DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO
+                                              .get(uncompressedFilename);
+        if (dictionaryInfo != null) {
+            final StringBuilder nameBuilder = new StringBuilder();
+
+            List<IndexInfo> sortedIndexInfos = sortedIndexInfos(dictionaryInfo.indexInfos);
+            for (int i = 0; i < sortedIndexInfos.size(); ++i) {
+                if (i > 0) {
+                    nameBuilder.append("-");
+                }
+                nameBuilder
+                .append(IsoUtils.INSTANCE.isoCodeToLocalizedLanguageName(appContext, sortedIndexInfos.get(i).shortName));
             }
-            if (!file.getName().endsWith(".quickdic")) {
-              continue;
+            name = nameBuilder.toString();
+        } else {
+            name = uncompressedFilename.replace(".quickdic", "");
+        }
+        fileToNameCache.put(uncompressedFilename, name);
+        return name;
+    }
+
+    public synchronized void moveDictionaryToTop(final DictionaryInfo dictionaryInfo) {
+        dictionaryConfig.dictionaryFilesOrdered.remove(dictionaryInfo.uncompressedFilename);
+        dictionaryConfig.dictionaryFilesOrdered.add(0, dictionaryInfo.uncompressedFilename);
+        PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig);
+    }
+
+    public synchronized void sortDictionaries() {
+        Collections.sort(dictionaryConfig.dictionaryFilesOrdered, uncompressedFilenameComparator);
+        PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig);
+    }
+
+    public synchronized void deleteDictionary(final DictionaryInfo dictionaryInfo) {
+        while (dictionaryConfig.dictionaryFilesOrdered.remove(dictionaryInfo.uncompressedFilename)) {
+        }
+        dictionaryConfig.uncompressedFilenameToDictionaryInfo
+        .remove(dictionaryInfo.uncompressedFilename);
+        getPath(dictionaryInfo.uncompressedFilename).delete();
+        PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig);
+    }
+
+    final Comparator<Object> collator = USE_COLLATOR ? CollatorWrapper.getInstance() : null;
+    final Comparator<String> uncompressedFilenameComparator = new Comparator<String>() {
+        @Override
+        public int compare(String uncompressedFilename1, String uncompressedFilename2) {
+            final String name1 = getDictionaryName(uncompressedFilename1);
+            final String name2 = getDictionaryName(uncompressedFilename2);
+            if (defaultLangName.length() > 0) {
+                if (name1.startsWith(defaultLangName + "-")
+                        && !name2.startsWith(defaultLangName + "-")) {
+                    return -1;
+                } else if (name2.startsWith(defaultLangName + "-")
+                        && !name1.startsWith(defaultLangName + "-")) {
+                    return 1;
+                }
             }
-            if (newDictionaryConfig.dictionaryInfoCache.containsKey(file.getName())) {
-              // We have it in our list already.
-              continue;
+            return collator != null ? collator.compare(name1, name2) : name1.compareToIgnoreCase(name2);
+        }
+    };
+    final Comparator<DictionaryInfo> dictionaryInfoComparator = new Comparator<DictionaryInfo>() {
+        @Override
+        public int compare(DictionaryInfo d1, DictionaryInfo d2) {
+            // Single-index dictionaries first.
+            if (d1.indexInfos.size() != d2.indexInfos.size()) {
+                return d1.indexInfos.size() - d2.indexInfos.size();
             }
-            final DictionaryInfo dictionaryInfo = Dictionary.getDictionaryInfo(file);
-            if (dictionaryInfo == null) {
-              Log.e(LOG, "Unable to parse dictionary: " + file.getPath());
-              continue;
+            return uncompressedFilenameComparator.compare(d1.uncompressedFilename,
+                    d2.uncompressedFilename);
+        }
+    };
+
+    public void backgroundUpdateDictionaries(final Runnable onUpdateFinished) {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                final DictionaryConfig oldDictionaryConfig = new DictionaryConfig();
+                synchronized (DictionaryApplication.this) {
+                    oldDictionaryConfig.dictionaryFilesOrdered
+                    .addAll(dictionaryConfig.dictionaryFilesOrdered);
+                }
+                final DictionaryConfig newDictionaryConfig = new DictionaryConfig();
+                for (final String uncompressedFilename : oldDictionaryConfig.dictionaryFilesOrdered) {
+                    final File dictFile = getPath(uncompressedFilename);
+                    final DictionaryInfo dictionaryInfo = Dictionary.getDictionaryInfo(dictFile);
+                    if (dictionaryInfo.isValid() || dictFile.exists()) {
+                        newDictionaryConfig.dictionaryFilesOrdered.add(uncompressedFilename);
+                        newDictionaryConfig.uncompressedFilenameToDictionaryInfo.put(
+                            uncompressedFilename, dictionaryInfo);
+                    }
+                }
+
+                // Are there dictionaries on the device that we didn't know
+                // about already?
+                // Pick them up and put them at the end of the list.
+                final List<String> toAddSorted = new ArrayList<>();
+                final File[] dictDirFiles = getDictDir().listFiles();
+                if (dictDirFiles != null) {
+                    for (final File file : dictDirFiles) {
+                        if (file.getName().endsWith(".zip")) {
+                            if (DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO
+                                    .containsKey(file.getName().replace(".zip", ""))) {
+                                file.delete();
+                            }
+                        }
+                        if (!file.getName().endsWith(".quickdic")) {
+                            continue;
+                        }
+                        if (newDictionaryConfig.uncompressedFilenameToDictionaryInfo
+                                .containsKey(file.getName())) {
+                            // We have it in our list already.
+                            continue;
+                        }
+                        final DictionaryInfo dictionaryInfo = Dictionary.getDictionaryInfo(file);
+                        if (!dictionaryInfo.isValid()) {
+                            Log.e(LOG, "Unable to parse dictionary: " + file.getPath());
+                        }
+
+                        toAddSorted.add(file.getName());
+                        newDictionaryConfig.uncompressedFilenameToDictionaryInfo.put(
+                            file.getName(), dictionaryInfo);
+                    }
+                } else {
+                    Log.w(LOG, "dictDir is not a directory: " + getDictDir().getPath());
+                }
+                if (!toAddSorted.isEmpty()) {
+                    Collections.sort(toAddSorted, uncompressedFilenameComparator);
+                    newDictionaryConfig.dictionaryFilesOrdered.addAll(toAddSorted);
+                }
+
+                try {
+                    PersistentObjectCache.getInstance()
+                    .write(C.DICTIONARY_CONFIGS, newDictionaryConfig);
+                } catch (Exception e) {
+                    Log.e(LOG, "Failed persisting dictionary configs", e);
+                }
+
+                synchronized (DictionaryApplication.this) {
+                    dictionaryConfig = newDictionaryConfig;
+                }
+
+                try {
+                    onUpdateFinished.run();
+                } catch (Exception e) {
+                    Log.e(LOG, "Exception running callback.", e);
+                }
             }
-            
-            toAddSorted.add(file.getName());
-            newDictionaryConfig.dictionaryInfoCache.put(file.getName(), dictionaryInfo);
-          }
-        } else {
-          Log.w(LOG, "dictDir is not a diretory: " + getDictDir().getPath());
+        }).start();
+    }
+
+    private boolean matchesFilters(final DictionaryInfo dictionaryInfo, final String[] filters) {
+        if (filters == null) {
+            return true;
         }
-        if (!toAddSorted.isEmpty()) {
-          Collections.sort(toAddSorted, uncompressedFilenameComparator);
-          newDictionaryConfig.dictionaryFilesOrdered.addAll(toAddSorted);
+        for (final String filter : filters) {
+            if (!getDictionaryName(dictionaryInfo.uncompressedFilename).toLowerCase().contains(
+                        filter)) {
+                return false;
+            }
         }
+        return true;
+    }
 
-        PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, newDictionaryConfig);
-        synchronized (this) {
-          dictionaryConfig = newDictionaryConfig;
+    public synchronized List<DictionaryInfo> getDictionariesOnDevice(String[] filters) {
+        final List<DictionaryInfo> result = new ArrayList<>(
+                dictionaryConfig.dictionaryFilesOrdered.size());
+        for (final String uncompressedFilename : dictionaryConfig.dictionaryFilesOrdered) {
+            final DictionaryInfo dictionaryInfo = dictionaryConfig.uncompressedFilenameToDictionaryInfo
+                                                  .get(uncompressedFilename);
+            if (dictionaryInfo != null && matchesFilters(dictionaryInfo, filters)) {
+                result.add(dictionaryInfo);
+            }
         }
-        
-        try {
-          onUpdateFinished.run();
-        } catch (Exception e) {
-          Log.e(LOG, "Exception running callback.", e);
+        return result;
+    }
+
+    public List<DictionaryInfo> getDownloadableDictionaries(String[] filters) {
+        final List<DictionaryInfo> result = new ArrayList<>(
+                dictionaryConfig.dictionaryFilesOrdered.size());
+
+        final Map<String, DictionaryInfo> remaining = new HashMap<>(
+                DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO);
+        remaining.keySet().removeAll(dictionaryConfig.dictionaryFilesOrdered);
+        for (final DictionaryInfo dictionaryInfo : remaining.values()) {
+            if (matchesFilters(dictionaryInfo, filters)) {
+                result.add(dictionaryInfo);
+            }
         }
-      }}).start();
-  }
-
-  public synchronized List<DictionaryInfo> getUsableDicts() {
-    final List<DictionaryInfo> result = new ArrayList<DictionaryInfo>(dictionaryConfig.dictionaryFilesOrdered.size());
-    for (final String uncompressedFilename : dictionaryConfig.dictionaryFilesOrdered) {
-      final DictionaryInfo dictionaryInfo = dictionaryConfig.dictionaryInfoCache.get(uncompressedFilename);
-      if (dictionaryInfo != null) {
-        result.add(dictionaryInfo);
-      }
+        Collections.sort(result, dictionaryInfoComparator);
+        return result;
+    }
+
+    public boolean updateAvailable(final DictionaryInfo dictionaryInfo) {
+        final DictionaryInfo downloadable =
+            DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO.get(
+                dictionaryInfo.uncompressedFilename);
+        return downloadable != null &&
+               downloadable.creationMillis > dictionaryInfo.creationMillis;
+    }
+
+    public DictionaryInfo getDownloadable(final String uncompressedFilename) {
+        return DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO.get(uncompressedFilename);
     }
-    return result;
-  }
-
-  public synchronized List<DictionaryInfo> getAllDictionaries() {
-    final List<DictionaryInfo> result = getUsableDicts();
-    
-    // The downloadable ones.
-    final Map<String,DictionaryInfo> remaining = new LinkedHashMap<String, DictionaryInfo>(DOWNLOADABLE_NAME_TO_INFO);
-    remaining.keySet().removeAll(dictionaryConfig.dictionaryFilesOrdered);
-    final List<DictionaryInfo> toAddSorted = new ArrayList<DictionaryInfo>(remaining.values());
-    Collections.sort(toAddSorted, dictionaryInfoComparator);
-    result.addAll(toAddSorted);
-    
-    return result;
-  }
-
-  public synchronized boolean isDictionaryOnDevice(String uncompressedFilename) {
-    return dictionaryConfig.dictionaryInfoCache.get(uncompressedFilename) != null;
-  }
-
-  public boolean updateAvailable(final DictionaryInfo dictionaryInfo) {
-    final DictionaryInfo downloadable = DOWNLOADABLE_NAME_TO_INFO.get(dictionaryInfo.uncompressedFilename);
-    return downloadable != null && downloadable.creationMillis > dictionaryInfo.creationMillis;
-  }
-
-  public DictionaryInfo getDownloadable(final String uncompressedFilename) {
-    final DictionaryInfo downloadable = DOWNLOADABLE_NAME_TO_INFO.get(uncompressedFilename);
-    return downloadable;
-  }
 
 }