From: Thad Hughes Date: Wed, 15 Feb 2012 23:35:47 +0000 (-0800) Subject: Tried to fix launch last used bug. X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=1051f65b85d8e17457ac6a3338155e0ccb7cd6d6 Tried to fix launch last used bug. --- diff --git a/res/raw/whats_new.html b/res/raw/whats_new.html index a11ed32..8aff685 100644 --- a/res/raw/whats_new.html +++ b/res/raw/whats_new.html @@ -9,12 +9,11 @@ -Thanks for updating to QuickDic 3.1. +Thanks for updating to QuickDic 3.2.

New features:

Search for multiple words at once (separated by spaces).
All words are hyperlinks: long-press any word in a dictionary -to lookup that word.
Go straight to last-used dictionary on launch.
Easier dictionary switching: long-press the switch-language button.
New English dictionaries: Azeri, Basque, Breton, Burmese, diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java index ac828e6..2ecaf37 100644 --- a/src/com/hughes/android/dictionary/DictionaryActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryActivity.java @@ -176,9 +176,6 @@ public class DictionaryActivity extends ListActivity { application = (DictionaryApplication) getApplication(); theme = application.getSelectedTheme(); - - // Clear them so that if something goes wrong, we won't relaunch. - clearDictionaryPrefs(this); final Intent intent = getIntent(); dictFile = new File(intent.getStringExtra(C.DICT_FILE)); @@ -372,15 +369,6 @@ public class DictionaryActivity extends ListActivity { prefs.commit(); } - private static void clearDictionaryPrefs(final Context context) { - final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(context).edit(); - prefs.remove(C.DICT_FILE); - prefs.remove(C.INDEX_INDEX); - prefs.remove(C.SEARCH_TOKEN); - prefs.commit(); - } - - @Override protected void onDestroy() { super.onDestroy(); @@ -523,7 +511,10 @@ public class DictionaryActivity extends ListActivity { Log.d(LOG, "onUpDownButton, destIndexEntry=" + dest.token); searchText.removeTextChangedListener(searchTextWatcher); searchText.setText(dest.token); - Selection.moveToRightEdge(searchText.getText(), searchText.getLayout()); + if (searchText.getLayout() != null) { + // Surprising, but this can otherwise crash sometimes... + Selection.moveToRightEdge(searchText.getText(), searchText.getLayout()); + } jumpToRow(index.sortedIndexEntries.get(destIndexEntry).startRow); searchText.addTextChangedListener(searchTextWatcher); } @@ -730,7 +721,8 @@ public class DictionaryActivity extends ListActivity { } if (keyCode == KeyEvent.KEYCODE_BACK) { Log.d(LOG, "Clearing dictionary prefs."); - DictionaryActivity.clearDictionaryPrefs(this); + // Pretend that we just autolaunched so that we won't do it again. + DictionaryManagerActivity.lastAutoLaunchMillis = System.currentTimeMillis(); } if (keyCode == KeyEvent.KEYCODE_ENTER) { Log.d(LOG, "Trying to hide soft keyboard."); diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java index ba56163..260fb1d 100644 --- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java @@ -52,7 +52,9 @@ import com.hughes.util.StringUtil; public class DictionaryManagerActivity extends ListActivity { static final String LOG = "QuickDic"; - static boolean canAutoLaunch = true; + static final long AUTO_LAUNCH_WAIT_MILLIS = 20 * 1000; + static long lastAutoLaunchMillis = -1; + static boolean blockAutoLaunch = false; DictionaryApplication application; Adapter adapter; @@ -91,10 +93,11 @@ public class DictionaryManagerActivity extends ListActivity { // ContextMenu. registerForContextMenu(getListView()); + blockAutoLaunch = false; final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); final String thanksForUpdatingLatestVersion = getString(R.string.thanksForUpdatingVersion); if (!prefs.getString(C.THANKS_FOR_UPDATING_VERSION, "").equals(thanksForUpdatingLatestVersion)) { - canAutoLaunch = false; + blockAutoLaunch = true; final AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setCancelable(false); final WebView webView = new WebView(getApplicationContext()); @@ -114,10 +117,6 @@ public class DictionaryManagerActivity extends ListActivity { alert.getWindow().setAttributes(layoutParams); prefs.edit().putString(C.THANKS_FOR_UPDATING_VERSION, thanksForUpdatingLatestVersion).commit(); } - - if (!getIntent().getBooleanExtra(C.CAN_AUTO_LAUNCH_DICT, true)) { - canAutoLaunch = false; - } } @Override @@ -154,11 +153,16 @@ public class DictionaryManagerActivity extends ListActivity { startActivity(getIntent()); } + final long now = System.currentTimeMillis(); final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - if (canAutoLaunch && prefs.contains(C.DICT_FILE) && prefs.contains(C.INDEX_INDEX)) { - canAutoLaunch = false; // Only autolaunch once per-process, on startup. + if (now - lastAutoLaunchMillis > AUTO_LAUNCH_WAIT_MILLIS && + getIntent().getBooleanExtra(C.CAN_AUTO_LAUNCH_DICT, true) && + prefs.contains(C.DICT_FILE) && + prefs.contains(C.INDEX_INDEX) && + !blockAutoLaunch) { Log.d(LOG, "Skipping Dictionary List, going straight to dictionary."); startActivity(DictionaryActivity.getLaunchIntent(new File(prefs.getString(C.DICT_FILE, "")), prefs.getInt(C.INDEX_INDEX, 0), prefs.getString(C.SEARCH_TOKEN, ""))); + lastAutoLaunchMillis = now; // Don't finish, so that user can hit back and get here. //finish(); return;