Fix show/hide menu items during search

app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java

@@ -128,7 +128,7 @@ public class TaskListFragment extends InjectingFragment
   private TaskAdapter taskAdapter = null;
   private TaskListRecyclerAdapter recyclerAdapter;
 
-  private PublishSubject<String> searchSubject;
+  private PublishSubject<String> searchSubject = PublishSubject.create();
   private Disposable searchDisposable;
 
     /*
@@ -256,11 +256,9 @@ public class TaskListFragment extends InjectingFragment
     MenuItem voice = menu.findItem(R.id.menu_voice_add);
     voice.setVisible(device.voiceInputAvailable());
 
-    MenuItem sort = menu.findItem(R.id.menu_sort);
+    MenuItem search =
-    MenuItem clearCompleted = menu.findItem(R.id.menu_clear_completed);
+        menu.findItem(R.id.menu_search)
-
+            .setOnActionExpandListener(
-    final MenuItem item = menu.findItem(R.id.menu_search);
-    item.setOnActionExpandListener(
                 new MenuItem.OnActionExpandListener() {
                   @Override
                   public boolean onMenuItemActionExpand(MenuItem item) {
@@ -269,11 +267,9 @@ public class TaskListFragment extends InjectingFragment
                             .debounce(SEARCH_DEBOUNCE_TIMEOUT, TimeUnit.MILLISECONDS)
                             .subscribe(q -> searchByQuery(q));
                     searchByQuery("");
-            sort.setVisible(false);
+                    for (int i = 0; i < menu.size(); i++) {
-            clearCompleted.setVisible(false);
+                      menu.getItem(i).setVisible(false);
-            completed.setVisible(false);
+                    }
-            hidden.setVisible(false);
-            voice.setVisible(false);
                     return true;
                   }
 
@@ -281,22 +277,21 @@ public class TaskListFragment extends InjectingFragment
                   public boolean onMenuItemActionCollapse(MenuItem item) {
                     taskListViewModel.searchByFilter(filter);
                     searchDisposable.dispose();
-            sort.setVisible(true);
+                    for (int i = 0; i < menu.size(); i++) {
-            clearCompleted.setVisible(true);
+                      menu.getItem(i).setVisible(true);
-            completed.setVisible(true);
+                    }
-            hidden.setVisible(true);
                     voice.setVisible(device.voiceInputAvailable());
                     return true;
                   }
                 });
-    searchSubject = PublishSubject.create();
+    ((SearchView) search.getActionView())
-    SearchView actionView = (SearchView) MenuItemCompat.getActionView(item);
+        .setOnQueryTextListener(
-    actionView.setOnQueryTextListener(
             new SearchView.OnQueryTextListener() {
               @Override
               public boolean onQueryTextSubmit(String query) {
-            ((MainActivity) getActivity()).onFilterItemClicked(createSearchFilter(query.trim()));
+                ((MainActivity) getActivity())
-            MenuItemCompat.collapseActionView(item);
+                    .onFilterItemClicked(createSearchFilter(query.trim()));
+                MenuItemCompat.collapseActionView(search);
                 return true;
               }