Prevent NPE

11 months ago · dfa35d4da4
parent 2e409a5dd4
commit dfa35d4da4
5 changed files with 168 additions and 161 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentAnswers.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswers.java
@ -271,6 +271,7 @@ public class FragmentAnswers extends FragmentBase {
            }
        });

+        if (searchView != null)
            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                @Override
                public boolean onQueryTextChange(String newText) {
--- a/app/src/main/java/eu/faircode/email/FragmentContacts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentContacts.java
@ -374,6 +374,7 @@ public class FragmentContacts extends FragmentBase {
            }
        });

+        if (searchView != null)
            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                @Override
                public boolean onQueryTextChange(String newText) {
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@ -669,6 +669,7 @@ public class FragmentFolders extends FragmentBase {
            }
        });

+        if (searchView != null)
            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                @Override
                public boolean onQueryTextChange(String newText) {
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@ -336,8 +336,10 @@ public class FragmentOptions extends FragmentBase {
            }
        };

+        if (searchView != null)
            searchView.setOnSuggestionListener(onSuggestionListener);

+        if (searchView != null)
            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                @Override
                public boolean onQueryTextSubmit(String query) {
@ -456,6 +458,7 @@ public class FragmentOptions extends FragmentBase {

        if (!TextUtils.isEmpty(saved)) {
            menuSearch.expandActionView();
+            if (searchView != null)
                searchView.setQuery(saved, false);
        }

--- a/app/src/main/java/eu/faircode/email/FragmentRules.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRules.java
@ -349,6 +349,7 @@ public class FragmentRules extends FragmentBase {
            }
        });

+        if (searchView != null)
            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                @Override
                public boolean onQueryTextChange(String newText) {