|
|
@ -109,13 +109,14 @@ 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);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int cryptType = _authenticatedSlide.getCryptType();
|
|
|
|
// wait for the key derivation background task
|
|
|
|
// wait for the key derivation background task
|
|
|
|
if (_passwordSlot == null || _passwordCipher == null) {
|
|
|
|
if (cryptType == CustomAuthenticationSlide.CRYPT_TYPE_NONE ||
|
|
|
|
|
|
|
|
_passwordSlot == null || _passwordCipher == null) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int cryptType = _authenticatedSlide.getCryptType();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// generate the master key
|
|
|
|
// generate the master key
|
|
|
|
MasterKey masterKey = null;
|
|
|
|
MasterKey masterKey = null;
|
|
|
|
if (cryptType != CustomAuthenticationSlide.CRYPT_TYPE_NONE) {
|
|
|
|
if (cryptType != CustomAuthenticationSlide.CRYPT_TYPE_NONE) {
|
|
|
|