Fixed search interaction

BobSilent · May 16, 2022 · 43dc9b9 · 43dc9b9
1 parent 438d90a
commit 43dc9b9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 36 deletions.
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswers.java b/app/src/main/java/eu/faircode/email/FragmentAnswers.java
@@ -233,18 +233,10 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
             searchView.setQuery(searching, true);
         }
 
-        getViewLifecycleOwner().getLifecycle().addObserver(new LifecycleObserver() {
-            @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-            public void onDestroyed() {
-                menuSearch.collapseActionView();
-                getViewLifecycleOwner().getLifecycle().removeObserver(this);
-            }
-        });
-
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextChange(String newText) {
-                if (getView() != null) {
+                if (getView() != null && menuSearch.isActionViewExpanded()) {
                     searching = newText;
                     adapter.search(newText);
                 }

diff --git a/app/src/main/java/eu/faircode/email/FragmentContacts.java b/app/src/main/java/eu/faircode/email/FragmentContacts.java
@@ -211,18 +211,10 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
             searchView.setQuery(searching, true);
         }
 
-        getViewLifecycleOwner().getLifecycle().addObserver(new LifecycleObserver() {
-            @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-            public void onDestroyed() {
-                menuSearch.collapseActionView();
-                getViewLifecycleOwner().getLifecycle().removeObserver(this);
-            }
-        });
-
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextChange(String newText) {
-                if (getView() != null) {
+                if (getView() != null && menuSearch.isActionViewExpanded()) {
                     searching = newText;
                     adapter.search(newText);
                 }

diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -611,18 +611,10 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
             searchView.setQuery(searching, true);
         }
 
-        getViewLifecycleOwner().getLifecycle().addObserver(new LifecycleObserver() {
-            @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-            public void onDestroyed() {
-                menuSearch.collapseActionView();
-                getViewLifecycleOwner().getLifecycle().removeObserver(this);
-            }
-        });
-
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextChange(String newText) {
-                if (getView() != null) {
+                if (getView() != null && menuSearch.isActionViewExpanded()) {
                     searching = newText;
                     adapter.search(newText);
                 }

diff --git a/app/src/main/java/eu/faircode/email/FragmentRules.java b/app/src/main/java/eu/faircode/email/FragmentRules.java
@@ -228,18 +228,10 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
             searchView.setQuery(searching, true);
         }
 
-        getViewLifecycleOwner().getLifecycle().addObserver(new LifecycleObserver() {
-            @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-            public void onDestroyed() {
-                menuSearch.collapseActionView();
-                getViewLifecycleOwner().getLifecycle().removeObserver(this);
-            }
-        });
-
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextChange(String newText) {
-                if (getView() != null) {
+                if (getView() != null && menuSearch.isActionViewExpanded()) {
                     searching = newText;
                     adapter.search(newText);
                 }