Expand search history handling.

diff --git a/src/com/hughes/android/dictionary/C.java b/src/com/hughes/android/dictionary/C.java
index 904618d222d0b6740f2cbfcfc6454a5912137761..dfa4c8a988b5a00cd8e8c6b4dc1e6ff6d3a55500 100644 (file)
--- a/src/com/hughes/android/dictionary/C.java
+++ b/src/com/hughes/android/dictionary/C.java
@@ -21,6 +21,7 @@ public class C {
     public static final String DICT_FILE = "dictFile";
     public static final String INDEX_SHORT_NAME = "indexShortName";
     public static final String SEARCH_TOKEN = "searchToken";
+    public static final String SEARCH_HISTORY = "searchHistory";
     public static final String CAN_AUTO_LAUNCH_DICT = "canAutoLaunch";
     public static final String SHOW_DOWNLOADABLE = "showLocal";
 

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 4e1bf6572d453b3d028c62778b10db5c33ab1474..9a4e913b69927d986b1bfd2543d8a637d49de10e 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -222,6 +222,7 @@ public class DictionaryActivity extends AppCompatActivity {
         Log.d(LOG, "onSaveInstanceState: " + searchView.getQuery().toString());
         outState.putString(C.INDEX_SHORT_NAME, index.shortName);
         outState.putString(C.SEARCH_TOKEN, searchView.getQuery().toString());
+        outState.putStringArrayList(C.SEARCH_HISTORY, searchHistory);
     }
 
     private int getMatchLen(String search, Index.IndexEntry e) {
@@ -254,6 +255,16 @@ public class DictionaryActivity extends AppCompatActivity {
         finish();
     }
 
+    private void saveSearchHistory() {
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        final SharedPreferences.Editor ed = prefs.edit();
+        for (int i = 0; i < searchHistory.size(); i++) {
+            ed.putString("history" + i, searchHistory.get(i));
+        }
+        ed.remove("history" + searchHistory.size());
+        ed.apply();
+    }
+
     private void addToSearchHistory(String text) {
         if (text == null || text.isEmpty()) return;
         int exists = searchHistory.indexOf(text);
@@ -625,8 +636,22 @@ public class DictionaryActivity extends AppCompatActivity {
                 t.setText(c.getString(1));
             }
         });
+
         // Set up search history
-        addToSearchHistory(text);
+        ArrayList<String> savedHistory = null;
+        if (savedInstanceState != null) savedHistory = savedInstanceState.getStringArrayList(C.SEARCH_HISTORY);
+        if (savedHistory != null && !savedHistory.isEmpty()) {
+        } else {
+            savedHistory = new ArrayList<>();
+            for (int i = 0; i < MAX_SEARCH_HISTORY; i++) {
+                String h = prefs.getString("history" + i, null);
+                if (h == null) break;
+                savedHistory.add(h);
+            }
+        }
+        for (int i = savedHistory.size() - 1; i >= 0; i--) {
+            addToSearchHistory(savedHistory.get(i));
+        }
 
         setSearchText(text, true);
         Log.d(LOG, "Trying to restore searchText=" + text);
@@ -754,6 +779,12 @@ public class DictionaryActivity extends AppCompatActivity {
         prefs.commit();
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        saveSearchHistory();
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -1395,6 +1426,7 @@ public class DictionaryActivity extends AppCompatActivity {
         if (hideKeyboard) {
             hideKeyboard();
         }
+        addToSearchHistory(text);
     }
 
     private void setSearchText(final String text, final boolean triggerSearch) {