luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-06-08 23:57:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some rare crashes when restoring the app after termination

Browse source 
Also fixes an issue where the app shortcuts would not work for unencrypted vaults
This commit is contained in:
Alexander Bakker 2019-04-08 23:13:11 +02:00
parent 6d93b78f9a
commit 0563ac917a
5 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -114,9 +114,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
super.onNewIntent(intent);
setIntent(intent);
if (!doShortcutActions() || _db.isLocked()) {
unlockDatabase(null);
}
doShortcutActions();
}
@Override
@ -305,15 +303,11 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
startActivityForResult(scannerActivity, CODE_SCAN);
}
private boolean doShortcutActions() {
// return false if an action was blocked by a locked database
// otherwise, always return true
private void doShortcutActions() {
Intent intent = getIntent();
String action = intent.getStringExtra("action");
if (action == null) {
return true;
} else if (_db.isLocked()) {
return false;
if (action == null || _db.isLocked()) {
return;
}
switch (action) {
@ -323,11 +317,9 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
}
intent.removeExtra("action");
return true;
}
public void startActivityForResult(Intent intent, int requestCode) {
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
super.startActivityForResult(intent, requestCode);
}
@ -361,6 +353,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
}
updateLockIcon();
doShortcutActions();
}
private BottomSheetDialog createBottomSheet(final DatabaseEntry entry) {