Temporarily disable search feature when unavailable

Which isn't working on Huawei devices
This commit is contained in:
Michael Schättgen 2019-09-09 23:51:13 +02:00
parent b6a31ed789
commit 658946ff70

View file

@ -516,32 +516,38 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
MenuItem searchViewMenuItem = menu.findItem(R.id.mi_search); MenuItem searchViewMenuItem = menu.findItem(R.id.mi_search);
_searchView = (SearchView) searchViewMenuItem.getActionView(); _searchView = (SearchView) searchViewMenuItem.getActionView();
_searchView.setFocusable(false); if (_searchView != null)
_searchView.setQueryHint(getString(R.string.search)); {
_searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { _searchView.setFocusable(false);
@Override _searchView.setQueryHint(getString(R.string.search));
public boolean onQueryTextSubmit(String s) { _searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
setTitle(getString(R.string.search)); @Override
getSupportActionBar().setSubtitle(s); public boolean onQueryTextSubmit(String s) {
_searchSubmitted = true; setTitle(getString(R.string.search));
collapseSearchView(); getSupportActionBar().setSubtitle(s);
return false; _searchSubmitted = true;
} collapseSearchView();
return false;
@Override
public boolean onQueryTextChange(String s) {
if (!_searchSubmitted) {
_entryListView.setSearchFilter(s);
} }
return false;
} @Override
}); public boolean onQueryTextChange(String s) {
_searchView.setOnSearchClickListener(v -> { if (!_searchSubmitted) {
if (_searchSubmitted) { _entryListView.setSearchFilter(s);
_searchSubmitted = false; }
_entryListView.setSearchFilter(null); return false;
} }
}); });
_searchView.setOnSearchClickListener(v -> {
if (_searchSubmitted) {
_searchSubmitted = false;
_entryListView.setSearchFilter(null);
}
});
} else {
searchViewMenuItem.setVisible(false);
}
return true; return true;
} }