Fix crash if File.list() returns null.

[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 e15dfff2fa9eeb37652a450deda399263a69bcfe..f23f7340f9dc0e554b0902c02723a1e5e8eda16d 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -406,7 +406,7 @@ 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) {
+        if (dictDir.isDirectory() && dictDir.list() != null && dictDir.list().length > 0) {
             return dir;
         }
         File efd = null;
@@ -564,6 +564,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)) {
         }