mirror of
https://github.com/beemdevelopment/Aegis.git
synced 2025-04-20 22:09:12 +00:00
Update sort category radio button state in the menu
This has been broken since 46e1421c28
.
I also removed some other logic from ``onCreateOptionsMenu`` that
doesn't seem to belong there anymore.
This commit is contained in:
parent
6d8eec0e21
commit
9d383b85d8
1 changed files with 5 additions and 9 deletions
|
@ -694,8 +694,10 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateSortCategoryMenu() {
|
private void updateSortCategoryMenu() {
|
||||||
SortCategory category = _prefs.getCurrentSortCategory();
|
if (_menu != null) {
|
||||||
_menu.findItem(category.getMenuItem()).setChecked(true);
|
SortCategory category = _prefs.getCurrentSortCategory();
|
||||||
|
_menu.findItem(category.getMenuItem()).setChecked(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onIntroResult() {
|
private void onIntroResult() {
|
||||||
|
@ -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) -> {
|
||||||
|
|
Loading…
Add table
Reference in a new issue