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

Fix a bug where the intro could never finish for plain text databases

Browse source
This commit is contained in:
Alexander Bakker 2017-12-10 19:22:00 +01:00
parent 95638b359b
commit 467a877a6d
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/me/impy/aegis/IntroActivity.java
View file

@ -109,12 +109,13 @@ public class IntroActivity extends AppIntro implements DerivationTask.Callback {
@Override @Override
public void onDonePressed(Fragment currentFragment) { public void onDonePressed(Fragment currentFragment) {
super.onDonePressed(currentFragment); super.onDonePressed(currentFragment);
// wait for the key derivation background task
if (_passwordSlot == null || _passwordCipher == null) {
return;
}
int cryptType = _authenticatedSlide.getCryptType(); int cryptType = _authenticatedSlide.getCryptType();
// wait for the key derivation background task
if (cryptType == CustomAuthenticationSlide.CRYPT_TYPE_NONE ||
_passwordSlot == null || _passwordCipher == null) {
return;
}
// generate the master key // generate the master key
MasterKey masterKey = null; MasterKey masterKey = null;