From: Thad Hughes Date: Sun, 29 Dec 2013 04:05:57 +0000 (-0800) Subject: Fixed add to wordlist on fresh install. X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=3e6ba19f49495e7ee8fb35707d9f668f866cc3eb Fixed add to wordlist on fresh install. --- diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index f91507a..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Thu Feb 16 14:09:53 PST 2012 -eclipse.preferences.version=1 -encoding//res/raw-de/whats_new.html=UTF-8 diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fe91208..a303ab1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="25" + android:versionName="5.0.1" > QuickDic - QuickDic 5.0.0 - 5.0.0 + QuickDic 5.0.1 + 5.0.1 Über QuickDic… @@ -14,15 +14,15 @@ Wörterbuch-Liste - Dictionaries on device - Downloadable dictionaries + Verfügbare Wörterbücher + Wörterbücher zum herunterladen %.1fMB - UPDATE! + Aktualisierung! Nach Anfang ziehen Wörterbuch entfernen %1$s: %2$,d Wörter - Show - Hide + Zeigen + Verstecken Error Unable to read dictionary directory: \n%1$s\n\nAndroid external storage directory: \n%2$s diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index a341a2d..e77134a 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -2,8 +2,8 @@ QuickDic - QuickDic 5.0.0 - 5.0.0 + QuickDic 5.0.1 + 5.0.1 Acerca de QuickDic… diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 0d68bb4..b1062ea 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -2,8 +2,8 @@ QuickDic - QuickDic 5.0.0 - 5.0.0 + QuickDic 5.0.1 + 5.0.1 About QuickDic… @@ -13,17 +13,17 @@ Please specify a default directory in the settings. - Gestione Dizionari - Dictionaries on device - Downloadable dictionaries + Gestione dizionari + Dizionari sul dispositivo + Dizionari scaricabili %.1fMB - UPDATE! + Aggiornare! Sposta in alto Cancella dizionario %1$s: %2$,d parole - Show - Hide - Error + Mostra + Nascondi + Errore Unable to read dictionary directory: \n%1$s\n\nAndroid external storage directory: \n%2$s diff --git a/res/values/strings.xml b/res/values/strings.xml index bbaf797..a291073 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2,8 +2,8 @@ QuickDic - QuickDic 5.0.0 - 5.0.0 + QuickDic 5.0.1 + 5.0.1 About QuickDic… @@ -17,7 +17,7 @@ Dictionaries on device Downloadable dictionaries %.1fMB - UPDATE! + Update! Move to top Delete dictionary %1$s: %2$,d words diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java index f15a186..999a4f0 100644 --- a/src/com/hughes/android/dictionary/DictionaryActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryActivity.java @@ -413,8 +413,7 @@ public class DictionaryActivity extends SherlockListActivity { registerForContextMenu(getListView()); // Cache some prefs. - wordList = new File(prefs.getString(getString(R.string.wordListFileKey), - new File(application.getDictDir(), "wordList.txt").getAbsolutePath())); + wordList = application.getWordListFile(); saveOnlyFirstSubentry = prefs.getBoolean(getString(R.string.saveOnlyFirstSubentryKey), false); clickOpensContextMenu = prefs.getBoolean(getString(R.string.clickOpensContextMenuKey), @@ -920,6 +919,8 @@ public class DictionaryActivity extends SherlockListActivity { return false; } }); + // Rats, this won't be shown: + searchForSelection.setIcon(R.drawable.abs__ic_search); } if (row instanceof TokenRow && ttsReady) { @@ -1008,7 +1009,7 @@ public class DictionaryActivity extends SherlockListActivity { final PrintWriter out = new PrintWriter(new FileWriter(wordList, true)); out.println(rawText.toString()); out.close(); - } catch (IOException e) { + } catch (Exception e) { Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e); Toast.makeText(this, getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()), diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java index 5c3b250..a4e0afe 100644 --- 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"); diff --git a/src/com/hughes/android/dictionary/PreferenceActivity.java b/src/com/hughes/android/dictionary/PreferenceActivity.java index 8b1e2f7..ac41a86 100644 --- a/src/com/hughes/android/dictionary/PreferenceActivity.java +++ b/src/com/hughes/android/dictionary/PreferenceActivity.java @@ -16,8 +16,10 @@ 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 { @@ -26,7 +28,16 @@ public class PreferenceActivity extends android.preference.PreferenceActivity { @SuppressWarnings("deprecation") @Override public void onCreate(Bundle savedInstanceState) { - setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId); + 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 @@ -37,7 +48,6 @@ public class PreferenceActivity extends android.preference.PreferenceActivity { addPreferencesFromResource(R.xml.preferences); ListPreference defaultDic = (ListPreference) findPreference(getResources().getString( R.string.defaultDicKey)); - DictionaryApplication application = (DictionaryApplication) getApplication(); List dicts = application.getDictionariesOnDevice(null); final CharSequence[] entries = new CharSequence[dicts.size()];