Fix trailing whitespace and DOS linebreaks.

[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 3c351d9da35eb12fa31a999cca6d78aec931a6f8..e15dfff2fa9eeb37652a450deda399263a69bcfe 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -283,7 +283,7 @@ public class DictionaryApplication extends Application {
         final List<String> dictionaryFilesOrdered = new ArrayList<String>();
 
         final Map<String, DictionaryInfo> uncompressedFilenameToDictionaryInfo = new LinkedHashMap<String, DictionaryInfo>();
-        
+
         /**
          * Sometimes a deserialized version of this data structure isn't valid.
          * @return
@@ -409,7 +409,11 @@ public class DictionaryApplication extends Application {
         if (dictDir.isDirectory() && dictDir.list().length > 0) {
             return dir;
         }
-        File efd = getApplicationContext().getExternalFilesDir(null);
+        File efd = null;
+        try {
+            efd = getApplicationContext().getExternalFilesDir(null);
+        } catch (Exception e) {
+        }
         if (efd != null) {
             efd.mkdirs();
             if (!dictDir.isDirectory() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
@@ -419,6 +423,9 @@ public class DictionaryApplication extends Application {
                 return efd.getAbsolutePath();
             }
         }
+        if (!dictDir.isDirectory() && !dictDir.mkdirs()) {
+            return getApplicationContext().getFilesDir().getAbsolutePath();
+        }
         return dir;
     }