Merge pull request #1533 from alexbakker/fix-sort-category

Update sort category radio button state in the menu
This commit is contained in:
Michael Schättgen 2024-11-24 13:45:13 +01:00 committed by GitHub
commit c250a17a19
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -694,9 +694,11 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
} }
private void updateSortCategoryMenu() { private void updateSortCategoryMenu() {
if (_menu != null) {
SortCategory category = _prefs.getCurrentSortCategory(); SortCategory category = _prefs.getCurrentSortCategory();
_menu.findItem(category.getMenuItem()).setChecked(true); _menu.findItem(category.getMenuItem()).setChecked(true);
} }
}
private void onIntroResult() { private void onIntroResult() {
loadEntries(); loadEntries();
@ -908,6 +910,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
handleIncomingIntent(); handleIncomingIntent();
updateLockIcon(); updateLockIcon();
updateSortCategoryMenu();
doShortcutActions(); doShortcutActions();
updateErrorCard(); updateErrorCard();
} }
@ -917,14 +920,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
_menu = menu; _menu = menu;
getMenuInflater().inflate(R.menu.menu_main, menu); getMenuInflater().inflate(R.menu.menu_main, menu);
updateLockIcon();
if (_loaded) {
setGroups(_vaultManager.getVault().getUsedGroups());
updateSortCategoryMenu();
}
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.setMaxWidth(Integer.MAX_VALUE); _searchView.setMaxWidth(Integer.MAX_VALUE);
_searchView.setOnQueryTextFocusChangeListener((v, hasFocus) -> { _searchView.setOnQueryTextFocusChangeListener((v, hasFocus) -> {