Fix search not being preserved when switching tabs

Author: Lonami

app/src/main/java/io/github/gsantner/memetastic/activity/MainActivity.java

@@ -122,6 +122,7 @@ public class MainActivity extends AppCompatActivity
     private long _lastInfoBarTextShownAt = 0;
     private SearchView _searchView;
     private MenuItem _searchItem;
+    private String _currentSearch = "";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -281,6 +282,7 @@ public void onBackPressed() {
             _drawer.closeDrawer(GravityCompat.START);
         } else if (!_searchView.isIconified()) {
             _searchView.setIconified(true);
+            updateSearchFilter("");
         } else {
             super.onBackPressed();
         }
@@ -376,13 +378,19 @@ public boolean handleBarClick(MenuItem item) {
         return true;
     }
 
-    private void setRecyclerMemeListAdapter(RecyclerView.Adapter adapter) {
+    private void setRecyclerMemeListAdapter(MemeItemAdapter adapter) {
+        adapter.setFilter(_currentSearch);
         _recyclerMemeList.setAdapter(adapter);
         boolean isEmpty = adapter.getItemCount() == 0;
         _emptylistLayout.setVisibility(isEmpty ? View.VISIBLE : View.GONE);
         _recyclerMemeList.setVisibility(isEmpty ? View.GONE : View.VISIBLE);
     }
 
+    private void updateSearchFilter(String newFilter) {
+        _currentSearch = newFilter;
+        ((MemeItemAdapter) _recyclerMemeList.getAdapter()).setFilter(newFilter);
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -657,17 +665,15 @@ public boolean onCreateOptionsMenu(final Menu menu) {
                 @Override
                 public boolean onQueryTextSubmit(String query) {
                     if (query != null) {
-                        MemeItemAdapter adapter = (MemeItemAdapter) _recyclerMemeList.getAdapter();
-                        adapter.setFilter(query);
+                        updateSearchFilter(query);
                     }
                     return false;
                 }
 
                 @Override
                 public boolean onQueryTextChange(String newText) {
                     if (newText != null) {
-                        MemeItemAdapter adapter = (MemeItemAdapter) _recyclerMemeList.getAdapter();
-                        adapter.setFilter(newText);
+                        updateSearchFilter(newText);
                     }
                     return false;
                 }
@@ -677,6 +683,7 @@ public boolean onQueryTextChange(String newText) {
                 public void onFocusChange(View v, boolean hasFocus) {
                     if (!hasFocus) {
                         _searchItem.collapseActionView();
+                        updateSearchFilter("");
                     }
                 }
             });