From 0b3a1469126bfb61d49a2b15437d531e15ae76f5 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 23 Sep 2023 19:45:14 +0200 Subject: [PATCH] Prevetn NPE --- app/src/main/java/eu/faircode/email/FragmentAnswers.java | 4 +++- app/src/main/java/eu/faircode/email/FragmentContacts.java | 4 +++- app/src/main/java/eu/faircode/email/FragmentFolders.java | 4 +++- app/src/main/java/eu/faircode/email/FragmentOptions.java | 3 ++- app/src/main/java/eu/faircode/email/FragmentRules.java | 4 +++- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswers.java b/app/src/main/java/eu/faircode/email/FragmentAnswers.java index e509e33d02..a90cc8c9e0 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAnswers.java +++ b/app/src/main/java/eu/faircode/email/FragmentAnswers.java @@ -243,7 +243,9 @@ public class FragmentAnswers extends FragmentBase { MenuItem menuSearch = menu.findItem(R.id.menu_search); SearchView searchView = (SearchView) menuSearch.getActionView(); - searchView.setQueryHint(getString(R.string.title_rules_search_hint)); + + if (searchView != null) + searchView.setQueryHint(getString(R.string.title_rules_search_hint)); final String search = searching; view.post(new RunnableEx("answers:search") { diff --git a/app/src/main/java/eu/faircode/email/FragmentContacts.java b/app/src/main/java/eu/faircode/email/FragmentContacts.java index da632d681f..ac50c32026 100644 --- a/app/src/main/java/eu/faircode/email/FragmentContacts.java +++ b/app/src/main/java/eu/faircode/email/FragmentContacts.java @@ -198,7 +198,9 @@ public class FragmentContacts extends FragmentBase { MenuItem menuSearch = menu.findItem(R.id.menu_search); SearchView searchView = (SearchView) menuSearch.getActionView(); - searchView.setQueryHint(getString(R.string.title_search)); + + if (searchView != null) + searchView.setQueryHint(getString(R.string.title_search)); final String search = searching; view.post(new RunnableEx("contacts:search") { diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java index bc331a4349..daa693ce6f 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolders.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java @@ -641,7 +641,9 @@ public class FragmentFolders extends FragmentBase { MenuItem menuSearch = menu.findItem(R.id.menu_search_folder); SearchView searchView = (SearchView) menuSearch.getActionView(); - searchView.setQueryHint(getString(R.string.title_search)); + + if (searchView != null) + searchView.setQueryHint(getString(R.string.title_search)); final String search = searching; view.post(new RunnableEx("folders:search") { diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java index 8d0abae713..9adde48b8f 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptions.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java @@ -274,7 +274,8 @@ public class FragmentOptions extends FragmentBase { final MenuItem menuSearch = menu.findItem(R.id.menu_search); final SearchView searchView = (SearchView) menuSearch.getActionView(); - searchView.setQueryHint(getString(R.string.title_search)); + if (searchView != null) + searchView.setQueryHint(getString(R.string.title_search)); final SearchView.OnSuggestionListener onSuggestionListener = new SearchView.OnSuggestionListener() { @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentRules.java b/app/src/main/java/eu/faircode/email/FragmentRules.java index 4fce10e03e..1e5599cdb0 100644 --- a/app/src/main/java/eu/faircode/email/FragmentRules.java +++ b/app/src/main/java/eu/faircode/email/FragmentRules.java @@ -321,7 +321,9 @@ public class FragmentRules extends FragmentBase { MenuItem menuSearch = menu.findItem(R.id.menu_search); SearchView searchView = (SearchView) menuSearch.getActionView(); - searchView.setQueryHint(getString(R.string.title_rules_search_hint)); + + if (searchView != null) + searchView.setQueryHint(getString(R.string.title_rules_search_hint)); final String search = searching; view.post(new RunnableEx("rules:search") {