X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryApplication.java;h=1e3788be869e7d830511705e391282e1af33c0ca;hp=77db79599f58c5b4dd79c344306c47b7a90e0e7f;hb=c76660b2772122109529d3616289980a7084eeeb;hpb=345055ac4070d908ac2d954a580bddf622c1ed00 diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java index 77db795..1e3788b 100644 --- a/src/com/hughes/android/dictionary/DictionaryApplication.java +++ b/src/com/hughes/android/dictionary/DictionaryApplication.java @@ -14,301 +14,546 @@ 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.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -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.os.Build; import android.os.Environment; -import android.preference.PreferenceManager; +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"; - - private static final File DICT_DIR = new File(Environment.getExternalStorageDirectory().getName(), "quickdic"); - - // Static, determined by resources (and locale). - // Unordered. - static Map DOWNLOADABLE_NAME_TO_INFO = null; - - static final class DictionaryConfig implements Serializable { - private static final long serialVersionUID = -1444177164708201262L; - // User-ordered list, persisted, just the ones that are/have been present. - final List dictionaryFilesOrdered = new ArrayList(); - final Set invalidatedFilenames = new LinkedHashSet(); - } - 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 dictionaryLinks = new ArrayList(); - } - DictionaryHistory dictionaryHistory = null; - - - @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(); +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 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 dictionaryFilesOrdered = new ArrayList<>(); + + final Map 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); + } + } + }); } - - - // 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 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; + } + }); + } + + 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; } - } - }); - } - - 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; + 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(); + } + } + if (!dictDir.isDirectory() && !dictDir.mkdirs()) { + return appContext.getFilesDir().getAbsolutePath(); + } + return dir; } - } - - static synchronized void staticInit(final Context context) { - if (DOWNLOADABLE_NAME_TO_INFO != null) { - return; + + 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; } - DOWNLOADABLE_NAME_TO_INFO = new LinkedHashMap(); - 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; + + 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) { } - 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); + return res; } - } - public File getPath(String uncompressedFilename) { - return new File(DICT_DIR, uncompressedFilename); - } + 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); + } + + 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; + } + } + + public File getPath(String uncompressedFilename) { + return new File(getDictDir(), uncompressedFilename); + } + String defaultLangISO2 = Locale.getDefault().getLanguage().toLowerCase(); + String defaultLangName = null; + final Map fileToNameCache = new HashMap<>(); + + public List sortedIndexInfos(List indexInfos) { + // Hack to put the default locale first in the name. + if (indexInfos.size() > 1 && + indexInfos.get(1).shortName.toLowerCase().equals(defaultLangISO2)) { + List result = new ArrayList<>(indexInfos); + ListUtil.swap(result, 0, 1); + return result; + } + return indexInfos; + } + + 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); + } - public List getUsableDicts() { - final List result = new ArrayList(dictionaryConfig.dictionaryFilesOrdered.size()); - for (int i = 0; i < dictionaryConfig.dictionaryFilesOrdered.size(); ++i) { - DictionaryInfo dictionaryInfo = dictionaryConfig.dictionaryFilesOrdered.get(i); - if (dictionaryConfig.invalidatedFilenames.contains(dictionaryInfo.uncompressedFilename)) { - dictionaryInfo = Dictionary.getDictionaryInfo(getPath(dictionaryInfo.uncompressedFilename)); + String name = fileToNameCache.get(uncompressedFilename); + if (name != null) { + return name; + } + + final DictionaryInfo dictionaryInfo = DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO + .get(uncompressedFilename); if (dictionaryInfo != null) { - dictionaryConfig.dictionaryFilesOrdered.set(i, dictionaryInfo); + final StringBuilder nameBuilder = new StringBuilder(); + + List 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)); + } + name = nameBuilder.toString(); + } else { + name = uncompressedFilename.replace(".quickdic", ""); } - } - if (dictionaryInfo != null) { - result.add(dictionaryInfo); - } + fileToNameCache.put(uncompressedFilename, name); + return name; } - if (!dictionaryConfig.invalidatedFilenames.isEmpty()) { - dictionaryConfig.invalidatedFilenames.clear(); - PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig); + + 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); } - return result; - } - - public String getLanguageName(final String isoCode) { - final Integer langCode = Language.isoCodeToResourceId.get(isoCode); - final String lang = langCode != null ? getApplicationContext().getString(langCode) : isoCode; - return lang; - } - - final Map fileToNameCache = new LinkedHashMap(); - public synchronized String getDictionaryName(final String uncompressedFilename) { - String name = fileToNameCache.get(uncompressedFilename); - if (name != null) { - return name; + + public synchronized void sortDictionaries() { + Collections.sort(dictionaryConfig.dictionaryFilesOrdered, uncompressedFilenameComparator); + PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig); } - - 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 synchronized void deleteDictionary(final DictionaryInfo dictionaryInfo) { + while (dictionaryConfig.dictionaryFilesOrdered.remove(dictionaryInfo.uncompressedFilename)) { } - nameBuilder.append(getLanguageName(dictionaryInfo.indexInfos.get(i).shortName)); - } - name = nameBuilder.toString(); - } else { - name = uncompressedFilename.replace(".quickdic", ""); + dictionaryConfig.uncompressedFilenameToDictionaryInfo + .remove(dictionaryInfo.uncompressedFilename); + getPath(dictionaryInfo.uncompressedFilename).delete(); + PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig); + } + + final Comparator collator = USE_COLLATOR ? CollatorWrapper.getInstance() : null; + final Comparator uncompressedFilenameComparator = new Comparator() { + @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; + } + } + return collator != null ? collator.compare(name1, name2) : name1.compareToIgnoreCase(name2); + } + }; + final Comparator dictionaryInfoComparator = new Comparator() { + @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(); + } + 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 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); + } + } + }).start(); } - fileToNameCache.put(uncompressedFilename, name); - return name; - } - - public void moveDictionaryToTop(final DictionaryInfo dictionaryInfo) { - dictionaryConfig.dictionaryFilesOrdered.remove(dictionaryInfo); - dictionaryConfig.dictionaryFilesOrdered.add(0, dictionaryInfo); - PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig); - } - - public void deleteDictionary(final DictionaryInfo dictionaryInfo) { - while (dictionaryConfig.dictionaryFilesOrdered.remove(dictionaryInfo)) {}; - getPath(dictionaryInfo.uncompressedFilename).delete(); - PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig); - } - - final Collator collator = Collator.getInstance(); - final Comparator comparator = new Comparator() { - @Override - public int compare(DictionaryInfo object1, DictionaryInfo object2) { - return collator.compare(getDictionaryName(object1.uncompressedFilename), getDictionaryName(object2.uncompressedFilename)); + + private boolean matchesFilters(final DictionaryInfo dictionaryInfo, final String[] filters) { + if (filters == null) { + return true; + } + for (final String filter : filters) { + if (!getDictionaryName(dictionaryInfo.uncompressedFilename).toLowerCase().contains( + filter)) { + return false; + } + } + return true; } - }; - - public List getAllDictionaries() { - final List result = getUsableDicts(); - - // The ones we knew about... - final Set known = new LinkedHashSet(); - for (final DictionaryInfo usable : result) { - known.add(usable.uncompressedFilename); + + public synchronized List getDictionariesOnDevice(String[] filters) { + final List 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); + } + } + return result; } - if (!dictionaryConfig.invalidatedFilenames.isEmpty()) { - dictionaryConfig.invalidatedFilenames.clear(); + + public List getDownloadableDictionaries(String[] filters) { + final List result = new ArrayList<>( + dictionaryConfig.dictionaryFilesOrdered.size()); + + final Map 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); + } + } + Collections.sort(result, dictionaryInfoComparator); + return result; } - - // 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 toAddSorted = new ArrayList(); - final File[] dictDirFiles = DICT_DIR.listFiles(); - for (final File file : dictDirFiles) { - if (!file.getName().endsWith(".quickdic")) { - continue; - } - if (known.contains(file.getName())) { - // We have it in our list already. - continue; - } - final DictionaryInfo dictionaryInfo = Dictionary.getDictionaryInfo(file); - if (dictionaryInfo == null) { - Log.e(LOG, "Unable to parse dictionary: " + file.getPath()); - continue; - } - known.add(file.getName()); - toAddSorted.add(dictionaryInfo); + + 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; } - if (!toAddSorted.isEmpty()) { - Collections.sort(toAddSorted, comparator); - result.addAll(toAddSorted); -// for (final DictionaryInfo dictionaryInfo : toAddSorted) { -// dictionaryConfig.dictionaryFilesOrdered.add(dictionaryInfo.uncompressedFilename); -// } - dictionaryConfig.dictionaryFilesOrdered.addAll(toAddSorted); - PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig); + + public DictionaryInfo getDownloadable(final String uncompressedFilename) { + return DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO.get(uncompressedFilename); } - // The downloadable ones. - final Map remaining = new LinkedHashMap(DOWNLOADABLE_NAME_TO_INFO); - remaining.keySet().removeAll(known); - toAddSorted.clear(); - toAddSorted.addAll(remaining.values()); - Collections.sort(toAddSorted, comparator); - result.addAll(toAddSorted); - return result; - } - - public boolean isDictionaryOnDevice(String uncompressedFilename) { - return getPath(uncompressedFilename).canRead(); - } - - 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; - } - - public void invalidateDictionaryInfo(final String uncompressedFilename) { - dictionaryConfig.invalidatedFilenames.add(uncompressedFilename); - PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig); - } - - public void onCreateGlobalOptionsMenu( - final Context context, final Menu menu) { - final MenuItem help = menu.add(getString(R.string.about)); - help.setOnMenuItemClickListener(new OnMenuItemClickListener() { - public boolean onMenuItemClick(final MenuItem menuItem) { - startActivity(HelpActivity.getLaunchIntent()); - return false; - } - }); - - 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()); - startActivity(intent); - 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()); - startActivity(intent); - return false; - } - }); - } - }