Fixed add to wordlist on fresh install.

[Dictionary.git] / src / com / hughes / android / dictionary / PreferenceActivity.java

diff --git a/src/com/hughes/android/dictionary/PreferenceActivity.java b/src/com/hughes/android/dictionary/PreferenceActivity.java
index edc50e44c2a96586c023a49029ff5641051e6ad5..ac41a864afb86e1d25a3f90a73f34e5e37b5995a 100644 (file)
--- a/src/com/hughes/android/dictionary/PreferenceActivity.java
+++ b/src/com/hughes/android/dictionary/PreferenceActivity.java
@@ -16,44 +16,55 @@ package com.hughes.android.dictionary;
 
 import java.util.List;
 
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.ListPreference;
+import android.preference.PreferenceManager;
 
 public class PreferenceActivity extends android.preference.PreferenceActivity {
-  
-  static boolean prefsMightHaveChanged = false;
-  
-  @SuppressWarnings("deprecation")
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    setTheme(((DictionaryApplication)getApplication()).getSelectedTheme().themeId);
-
-    /**
-     * @author Dominik Köppl
-     * Preference: select default dictionary
-     * As this list is dynamically generated, we have to do it in this fashion
-     */
-    super.onCreate(savedInstanceState);
-    addPreferencesFromResource(R.xml.preferences);
-    ListPreference defaultDic = (ListPreference) findPreference(getResources().getString(R.string.defaultDicKey));
-    DictionaryApplication application = (DictionaryApplication) getApplication();
-    List<DictionaryInfo> dicts = application.getDictionariesOnDevice();
-    
-       final CharSequence[] entries = new CharSequence[dicts.size()];
-       final CharSequence[] entryvalues = new CharSequence[dicts.size()];
-
-       for(int i = 0; i < entries.length; ++i)
-       {
-               entries[i] = dicts.get(i).dictInfo;
-               entryvalues[i] = dicts.get(i).uncompressedFilename;
-       }
-       
-       defaultDic.setEntries(entries);
-       defaultDic.setEntryValues(entryvalues);
-  }
-
-  @Override
-  public void onContentChanged() {
-    super.onContentChanged();
-  }
+
+    static boolean prefsMightHaveChanged = false;
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        final DictionaryApplication application = (DictionaryApplication) getApplication();
+        setTheme(application.getSelectedTheme().themeId);
+        
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        if (prefs.getString(getString(R.string.quickdicDirectoryKey), "").equals("")) {
+            prefs.edit().putString(getString(R.string.quickdicDirectoryKey), application.getDictDir().getAbsolutePath()).commit();
+        }
+        if (prefs.getString(getString(R.string.wordListFileKey), "").equals("")) {
+            prefs.edit().putString(getString(R.string.wordListFileKey), application.getWordListFile().getAbsolutePath()).commit();
+        }
+
+        /**
+         * @author Dominik Köppl Preference: select default dictionary As this
+         *         list is dynamically generated, we have to do it in this
+         *         fashion
+         */
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.preferences);
+        ListPreference defaultDic = (ListPreference) findPreference(getResources().getString(
+                R.string.defaultDicKey));
+        List<DictionaryInfo> dicts = application.getDictionariesOnDevice(null);
+
+        final CharSequence[] entries = new CharSequence[dicts.size()];
+        final CharSequence[] entryvalues = new CharSequence[dicts.size()];
+
+        for (int i = 0; i < entries.length; ++i)
+        {
+            entries[i] = dicts.get(i).dictInfo;
+            entryvalues[i] = dicts.get(i).uncompressedFilename;
+        }
+
+        defaultDic.setEntries(entries);
+        defaultDic.setEntryValues(entryvalues);
+    }
+
+    @Override
+    public void onContentChanged() {
+        super.onContentChanged();
+    }
 }