package com.hughes.android.dictionary;
-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.v4.view.MenuItemCompat;
import android.util.Log;
import android.util.TypedValue;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.ImageView.ScaleType;
-import android.widget.LinearLayout;
-
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
+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.dictionary.engine.Language.LanguageResources;
-import com.hughes.android.util.IntentLauncher;
import com.hughes.android.util.PersistentObjectCache;
import com.hughes.util.ListUtil;
-import com.ibm.icu.text.Collator;
import java.io.BufferedReader;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.LinkedHashMap;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-public class DictionaryApplication extends Application {
+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;
- static final class DictionaryConfig implements Serializable {
+ 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<String>();
+ final List<String> dictionaryFilesOrdered = new ArrayList<>();
+
+ final Map<String, DictionaryInfo> uncompressedFilenameToDictionaryInfo = new HashMap<>();
- final Map<String, DictionaryInfo> uncompressedFilenameToDictionaryInfo = new LinkedHashMap<String, DictionaryInfo>();
+ /**
+ * Sometimes a deserialized version of this data structure isn't valid.
+ */
+ @SuppressWarnings("ConstantConditions")
+ boolean isValid() {
+ return uncompressedFilenameToDictionaryInfo != null && dictionaryFilesOrdered != null;
+ }
}
DictionaryConfig dictionaryConfig = null;
- int languageButtonPixels = -1;
-
- // 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;
+ 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 LinkedHashMap<String, DictionaryInfo>();
+ DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO = new HashMap<>();
final BufferedReader reader = new BufferedReader(
- new InputStreamReader(context.getResources().openRawResource(R.raw.dictionary_info)));
+ new InputStreamReader(context.getResources().openRawResource(R.raw.dictionary_info)));
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);
DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO.put(
- dictionaryInfo.uncompressedFilename, dictionaryInfo);
+ dictionaryInfo.uncompressedFilename, dictionaryInfo);
}
- reader.close();
} catch (IOException e) {
Log.e(LOG, "Failed to load downloadable dictionary lists.", e);
}
+ try {
+ reader.close();
+ } catch (IOException ignored) {}
}
- private File dictDir;
-
- @Override
- public void onCreate() {
- super.onCreate();
+ public synchronized void init(Context c) {
+ if (appContext != null) {
+ assert c == appContext;
+ return;
+ }
+ appContext = c;
Log.d("QuickDic", "Application: onCreate");
- TransliteratorManager.init(null);
- staticInit(getApplicationContext());
+ TransliteratorManager.init(null, threadBackground);
+ staticInit(appContext);
languageButtonPixels = (int) TypedValue.applyDimension(
- TypedValue.COMPLEX_UNIT_DIP, 60, getResources().getDisplayMetrics());
+ TypedValue.COMPLEX_UNIT_DIP, 60, appContext.getResources().getDisplayMetrics());
// Load the dictionaries we know about.
- dictionaryConfig = PersistentObjectCache.init(getApplicationContext()).read(
- C.DICTIONARY_CONFIGS, DictionaryConfig.class);
+ dictionaryConfig = PersistentObjectCache.init(appContext).read(
+ C.DICTIONARY_CONFIGS, DictionaryConfig.class);
if (dictionaryConfig == null) {
dictionaryConfig = new DictionaryConfig();
}
+ if (!dictionaryConfig.isValid()) {
+ dictionaryConfig = new DictionaryConfig();
+ }
// Theme stuff.
- setTheme(getSelectedTheme().themeId);
- final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+ appContext.setTheme(getSelectedTheme().themeId);
+ final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
prefs.registerOnSharedPreferenceChangeListener(new OnSharedPreferenceChangeListener() {
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
- String key) {
+ String key) {
Log.d("QuickDic", "prefs changed: " + key);
- if (key.equals(getString(R.string.themeKey))) {
- setTheme(getSelectedTheme().themeId);
+ if (key.equals(appContext.getString(R.string.themeKey))) {
+ appContext.setTheme(getSelectedTheme().themeId);
}
}
});
}
- public void onCreateGlobalOptionsMenu(
- final Context context, final Menu menu) {
- final MenuItem about = menu.add(getString(R.string.about));
- about.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- about.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+ 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) {
- final Intent intent = new Intent().setClassName(AboutActivity.class
- .getPackage().getName(), AboutActivity.class.getCanonicalName());
+ PreferenceActivity.prefsMightHaveChanged = true;
+ final Intent intent = new Intent(c, PreferenceActivity.class);
context.startActivity(intent);
return false;
}
});
- final MenuItem help = menu.add(getString(R.string.help));
- help.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+ 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());
+ context.startActivity(HtmlDisplayActivity.getHelpLaunchIntent(c));
return false;
}
});
- final MenuItem preferences = menu.add(getString(R.string.settings));
- preferences.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+ 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) {
- PreferenceActivity.prefsMightHaveChanged = true;
- final Intent intent = new Intent().setClassName(PreferenceActivity.class
- .getPackage().getName(), PreferenceActivity.class.getCanonicalName());
+ 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 reportIssue = menu.add(getString(R.string.reportIssue));
- reportIssue.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- reportIssue.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+ 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(Intent.ACTION_VIEW);
- intent.setData(Uri
- .parse("http://code.google.com/p/quickdic-dictionary/issues/entry"));
+ 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;
+ }
+ 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;
+ }
+
public synchronized File getDictDir() {
// This metaphor doesn't work, because we've already reset
// prefsMightHaveChanged.
- // if (dictDir == null || PreferenceActivity.prefsMightHaveChanged) {
- final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
- final File defaultDictDir = new File(Environment.getExternalStorageDirectory(), "quickDic");
- String dir = prefs.getString(getString(R.string.quickdicDirectoryKey),
- defaultDictDir.getAbsolutePath());
+ final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
+ String dir = prefs.getString(appContext.getString(R.string.quickdicDirectoryKey), "");
if (dir.isEmpty()) {
- dir = defaultDictDir.getAbsolutePath();
+ dir = selectDefaultDir();
}
- dictDir = new File(dir);
+ File dictDir = new File(dir);
dictDir.mkdirs();
+ if (!dictDir.isDirectory() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ appContext.getExternalFilesDirs(null);
+ }
return dictDir;
}
- public C.Theme getSelectedTheme() {
- final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
- final String theme = prefs.getString(getString(R.string.themeKey), "themeLight");
+ 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) {
+ }
+ return res;
+ }
+
+ 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 C.Theme.LIGHT;
+ return Theme.LIGHT;
} else {
- return C.Theme.DEFAULT;
+ return Theme.DEFAULT;
}
}
String defaultLangISO2 = Locale.getDefault().getLanguage().toLowerCase();
String defaultLangName = null;
- final Map<String, String> fileToNameCache = new LinkedHashMap<String, String>();
-
- public String isoCodeToLocalizedLanguageName(final String isoCode) {
- final Language.LanguageResources languageResources = Language.isoCodeToResources
- .get(isoCode);
- final String lang = languageResources != null ? getApplicationContext().getString(
- languageResources.nameId) : isoCode;
- return lang;
- }
+ 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<DictionaryInfo.IndexInfo>(indexInfos);
+ List<IndexInfo> result = new ArrayList<>(indexInfos);
ListUtil.swap(result, 0, 1);
return result;
}
defaultLangName = null;
}
if (defaultLangName == null) {
- defaultLangName = isoCodeToLocalizedLanguageName(defaultLangISO2);
+ defaultLangName = IsoUtils.INSTANCE.isoCodeToLocalizedLanguageName(appContext, defaultLangISO2);
}
String name = fileToNameCache.get(uncompressedFilename);
}
final DictionaryInfo dictionaryInfo = DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO
- .get(uncompressedFilename);
+ .get(uncompressedFilename);
if (dictionaryInfo != null) {
final StringBuilder nameBuilder = new StringBuilder();
nameBuilder.append("-");
}
nameBuilder
- .append(isoCodeToLocalizedLanguageName(sortedIndexInfos.get(i).shortName));
+ .append(IsoUtils.INSTANCE.isoCodeToLocalizedLanguageName(appContext, sortedIndexInfos.get(i).shortName));
}
name = nameBuilder.toString();
} else {
return name;
}
- public View createButton(final Context context, final DictionaryInfo dictionaryInfo,
- final IndexInfo indexInfo) {
- LanguageResources languageResources = Language.isoCodeToResources.get(indexInfo.shortName);
- View result;
-
- if (languageResources == null || languageResources.flagId <= 0) {
- Button button = new Button(context);
- button.setText(indexInfo.shortName);
- result = button;
- } else {
- ImageButton button = new ImageButton(context);
- button.setImageResource(languageResources.flagId);
- button.setScaleType(ScaleType.FIT_CENTER);
- result = button;
- }
- result.setMinimumWidth(languageButtonPixels);
- result.setMinimumHeight(languageButtonPixels * 2 / 3);
- // result.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
- // LayoutParams.WRAP_CONTENT));
- return result;
- }
-
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);
+ .remove(dictionaryInfo.uncompressedFilename);
getPath(dictionaryInfo.uncompressedFilename).delete();
PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig);
}
- final Collator collator = Collator.getInstance();
+ final Comparator<Object> collator = USE_COLLATOR ? CollatorWrapper.getInstance() : null;
final Comparator<String> uncompressedFilenameComparator = new Comparator<String>() {
@Override
public int compare(String uncompressedFilename1, String uncompressedFilename2) {
return 1;
}
}
- return collator.compare(name1, name2);
+ return collator != null ? collator.compare(name1, name2) : name1.compareToIgnoreCase(name2);
}
};
final Comparator<DictionaryInfo> dictionaryInfoComparator = new Comparator<DictionaryInfo>() {
@Override
public void run() {
final DictionaryConfig oldDictionaryConfig = new DictionaryConfig();
- synchronized (this) {
+ synchronized (DictionaryApplication.this) {
oldDictionaryConfig.dictionaryFilesOrdered
- .addAll(dictionaryConfig.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 != null) {
+ if (dictionaryInfo.isValid() || dictFile.exists()) {
newDictionaryConfig.dictionaryFilesOrdered.add(uncompressedFilename);
newDictionaryConfig.uncompressedFilenameToDictionaryInfo.put(
- uncompressedFilename, dictionaryInfo);
+ 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<String>();
+ final List<String> toAddSorted = new ArrayList<>();
final File[] dictDirFiles = getDictDir().listFiles();
if (dictDirFiles != null) {
for (final File file : dictDirFiles) {
continue;
}
final DictionaryInfo dictionaryInfo = Dictionary.getDictionaryInfo(file);
- if (dictionaryInfo == null) {
+ if (!dictionaryInfo.isValid()) {
Log.e(LOG, "Unable to parse dictionary: " + file.getPath());
- continue;
}
toAddSorted.add(file.getName());
newDictionaryConfig.uncompressedFilenameToDictionaryInfo.put(
- file.getName(), dictionaryInfo);
+ file.getName(), dictionaryInfo);
}
} else {
- Log.w(LOG, "dictDir is not a diretory: " + getDictDir().getPath());
+ Log.w(LOG, "dictDir is not a directory: " + getDictDir().getPath());
}
if (!toAddSorted.isEmpty()) {
Collections.sort(toAddSorted, uncompressedFilenameComparator);
newDictionaryConfig.dictionaryFilesOrdered.addAll(toAddSorted);
}
- PersistentObjectCache.getInstance()
- .write(C.DICTIONARY_CONFIGS, newDictionaryConfig);
- synchronized (this) {
+ try {
+ PersistentObjectCache.getInstance()
+ .write(C.DICTIONARY_CONFIGS, newDictionaryConfig);
+ } catch (Exception e) {
+ Log.e(LOG, "Failed persisting dictionary configs", e);
+ }
+
+ synchronized (DictionaryApplication.this) {
dictionaryConfig = newDictionaryConfig;
}
}).start();
}
- public boolean matchesFilters(final DictionaryInfo dictionaryInfo, final String[] filters) {
+ 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)) {
+ filter)) {
return false;
}
}
}
public synchronized List<DictionaryInfo> getDictionariesOnDevice(String[] filters) {
- final List<DictionaryInfo> result = new ArrayList<DictionaryInfo>(
+ final List<DictionaryInfo> result = new ArrayList<>(
dictionaryConfig.dictionaryFilesOrdered.size());
for (final String uncompressedFilename : dictionaryConfig.dictionaryFilesOrdered) {
final DictionaryInfo dictionaryInfo = dictionaryConfig.uncompressedFilenameToDictionaryInfo
- .get(uncompressedFilename);
+ .get(uncompressedFilename);
if (dictionaryInfo != null && matchesFilters(dictionaryInfo, filters)) {
result.add(dictionaryInfo);
}
}
public List<DictionaryInfo> getDownloadableDictionaries(String[] filters) {
- final List<DictionaryInfo> result = new ArrayList<DictionaryInfo>(
+ final List<DictionaryInfo> result = new ArrayList<>(
dictionaryConfig.dictionaryFilesOrdered.size());
- final Map<String, DictionaryInfo> remaining = new LinkedHashMap<String, DictionaryInfo>(
+ 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()) {
return result;
}
- public synchronized boolean isDictionaryOnDevice(String uncompressedFilename) {
- return dictionaryConfig.uncompressedFilenameToDictionaryInfo.get(uncompressedFilename) != null;
- }
-
public boolean updateAvailable(final DictionaryInfo dictionaryInfo) {
final DictionaryInfo downloadable =
- DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO.get(
- dictionaryInfo.uncompressedFilename);
+ DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO.get(
+ dictionaryInfo.uncompressedFilename);
return downloadable != null &&
- downloadable.creationMillis > dictionaryInfo.creationMillis;
+ downloadable.creationMillis > dictionaryInfo.creationMillis;
}
public DictionaryInfo getDownloadable(final String uncompressedFilename) {
- final DictionaryInfo downloadable = DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO
- .get(uncompressedFilename);
- return downloadable;
+ return DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO.get(uncompressedFilename);
}
}