List files only once, also avoids a potential race condition.

[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 99e3088c0c18acdcdfe88bb299adf9584df6d0f5..1e46f4b0c1adb87b8bd25e9d1d82768dfc7a7143 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -53,7 +53,7 @@ import java.io.Serializable;
 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;
@@ -113,7 +113,7 @@ public class DictionaryApplication extends Application {
 
     // Useful:
     // http://www.loc.gov/standards/iso639-2/php/code_list.php
-    public static final Map<String, LanguageResources> isoCodeToResources = new LinkedHashMap<String, LanguageResources>();
+    public static final Map<String, LanguageResources> isoCodeToResources = new HashMap<String, LanguageResources>();
     static {
         isoCodeToResources.put("AF", new LanguageResources("Afrikaans", R.string.AF,
                 R.drawable.flag_of_south_africa));
@@ -282,8 +282,8 @@ public class DictionaryApplication extends Application {
         // present.
         final List<String> dictionaryFilesOrdered = new ArrayList<String>();
 
-        final Map<String, DictionaryInfo> uncompressedFilenameToDictionaryInfo = new LinkedHashMap<String, DictionaryInfo>();
-        
+        final Map<String, DictionaryInfo> uncompressedFilenameToDictionaryInfo = new HashMap<String, DictionaryInfo>();
+
         /**
          * Sometimes a deserialized version of this data structure isn't valid.
          * @return
@@ -301,7 +301,7 @@ public class DictionaryApplication extends Application {
         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<String, DictionaryInfo>();
         final BufferedReader reader = new BufferedReader(
                 new InputStreamReader(context.getResources().openRawResource(R.raw.dictionary_info)));
         try {
@@ -406,7 +406,8 @@ public class DictionaryApplication extends Application {
         final File defaultDictDir = new File(Environment.getExternalStorageDirectory(), "quickDic");
         String dir = defaultDictDir.getAbsolutePath();
         File dictDir = new File(dir);
-        if (dictDir.isDirectory() && dictDir.list().length > 0) {
+        String[] fileList = dictDir.isDirectory() ? dictDir.list() : null;
+        if (fileList != null && fileList.length > 0) {
             return dir;
         }
         File efd = null;
@@ -423,6 +424,9 @@ public class DictionaryApplication extends Application {
                 return efd.getAbsolutePath();
             }
         }
+        if (!dictDir.isDirectory() && !dictDir.mkdirs()) {
+            return getApplicationContext().getFilesDir().getAbsolutePath();
+        }
         return dir;
     }
 
@@ -478,7 +482,7 @@ public class DictionaryApplication extends Application {
 
     String defaultLangISO2 = Locale.getDefault().getLanguage().toLowerCase();
     String defaultLangName = null;
-    final Map<String, String> fileToNameCache = new LinkedHashMap<String, String>();
+    final Map<String, String> fileToNameCache = new HashMap<String, String>();
 
     public String isoCodeToLocalizedLanguageName(final String isoCode) {
         final Language.LanguageResources languageResources = isoCodeToResources
@@ -561,6 +565,11 @@ public class DictionaryApplication extends Application {
         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)) {
         }
@@ -708,7 +717,7 @@ public class DictionaryApplication extends Application {
         final List<DictionaryInfo> result = new ArrayList<DictionaryInfo>(
                 dictionaryConfig.dictionaryFilesOrdered.size());
 
-        final Map<String, DictionaryInfo> remaining = new LinkedHashMap<String, DictionaryInfo>(
+        final Map<String, DictionaryInfo> remaining = new HashMap<String, DictionaryInfo>(
                 DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO);
         remaining.keySet().removeAll(dictionaryConfig.dictionaryFilesOrdered);
         for (final DictionaryInfo dictionaryInfo : remaining.values()) {