Remove dead code.

The search token was saved and restored to shared preferences
for no reason at all.

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 14aa4ff15d0a00375771bfe9aefc18cfc884a136..8df2a2601ac2178b17503f1b96cf9076aff0dd7e 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -563,7 +563,7 @@ public class DictionaryActivity extends ActionBarActivity {
         setSearchText(text, true);
         Log.d(LOG, "Trying to restore searchText=" + text);
 
-        setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString());
+        setDictionaryPrefs(this, dictFile, index.shortName);
 
         updateLangButton();
         searchView.requestFocus();
@@ -678,14 +678,14 @@ public class DictionaryActivity extends ActionBarActivity {
     }
 
     private static void setDictionaryPrefs(final Context context, final File dictFile,
-                                           final String indexShortName, final String searchToken) {
+                                           final String indexShortName) {
         final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(
                 context).edit();
         if (dictFile != null) {
             prefs.putString(C.DICT_FILE, dictFile.getPath());
             prefs.putString(C.INDEX_SHORT_NAME, indexShortName);
         }
-        prefs.putString(C.SEARCH_TOKEN, ""); // Don't need to save search token.
+        prefs.remove(C.SEARCH_TOKEN); // Don't need to save search token.
         prefs.commit();
     }
 
@@ -1298,7 +1298,7 @@ public class DictionaryActivity extends ActionBarActivity {
             indexAdapter = new IndexAdapter(index);
             setListAdapter(indexAdapter);
             Log.d(LOG, "changingIndex, newLang=" + index.longName);
-            setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString());
+            setDictionaryPrefs(this, dictFile, index.shortName);
             updateLangButton();
         }
         setSearchText(newSearchText, true, hideKeyboard);

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 7d0bc8918f52b2adba929eb8a58240ddf0b638d6..6becda6cb35ae04c846fb625d761ff14cd46fb72 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -468,7 +468,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             startActivity(DictionaryActivity.getLaunchIntent(getApplicationContext(),
                           new File(prefs.getString(C.DICT_FILE, "")),
                           prefs.getString(C.INDEX_SHORT_NAME, ""),
-                          prefs.getString(C.SEARCH_TOKEN, "")));
+                          ""));
             finish();
             return;
         }