Fixed add to wordlist on fresh install.

[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 5c3b25027c586117e98d4be3c210f75ed6bcac41..a4e0afe20af21b31d53b3aa165949379ab47a9cf 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -193,12 +193,10 @@ public class DictionaryApplication extends Application {
     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());
+        String dir = prefs.getString(getString(R.string.quickdicDirectoryKey), "");
         if (dir.isEmpty()) {
+            final File defaultDictDir = new File(Environment.getExternalStorageDirectory(), "quickDic");
             dir = defaultDictDir.getAbsolutePath();
         }
         dictDir = new File(dir);
@@ -206,6 +204,15 @@ public class DictionaryApplication extends Application {
         return dictDir;
     }
 
+    public File getWordListFile() {
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        String file = prefs.getString(getString(R.string.wordListFileKey), "");
+        if (file.isEmpty()) {
+            return new File(getDictDir(), "wordList.txt");
+        }
+        return new File(file);
+    }
+
     public C.Theme getSelectedTheme() {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         final String theme = prefs.getString(getString(R.string.themeKey), "themeLight");