luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-16 23:12:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor fixes for group chips, remove remnants of filter menu item

Browse source
This commit is contained in:
Alexander Bakker 2021-01-27 18:24:52 +01:00
parent 40fbe39474
commit 778000aa24
33 changed files with 44 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
View file

@ -249,7 +249,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
} else {
intent.putExtra("entryUUID", entry.getUUID());
}
intent.putExtra("selectedGroup", (ArrayList<String>) _selectedGroups);
startActivityForResult(intent, requestCode);
}
@ -326,11 +325,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
_menu.findItem(category.getMenuItem()).setChecked(true);
}
private void setGroupFilter(List<String> group) {
_selectedGroups = group;
_entryListView.setGroupFilter(group, true);
}
private void onDoIntroResult() {
_vault = _app.getVaultManager();
loadEntries();
@ -460,10 +454,8 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
if (_app.isVaultLocked()) {
startAuthActivity(false);
} else if (_loaded) {
// update the list of groups in the filter menu
if (_menu != null) {
_entryListView.setGroups(_vault.getGroups());
}
// update the list of groups in the entry list view so that the chip gets updated
_entryListView.setGroups(_vault.getGroups());
// refresh all codes to prevent showing old ones
_entryListView.refresh(false);
@ -485,8 +477,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
_entryListView.setSearchFilter(null);
collapseSearchView();
setTitle("Aegis");
setGroupFilter(_selectedGroups);
setTitle(R.string.app_name);
return;
}
@ -566,16 +557,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
_app.lock(true);
return true;
default:
/*if (item.getGroupId() == R.id.action_filter_group) {
item.setChecked(true);
String group = null;
if (item.getItemId() != R.id.menu_filter_all) {
group = item.getTitle().toString();
}
setGroupFilter(group);
}*/
if (item.getGroupId() == R.id.action_sort_category) {
item.setChecked(true);