From ca68f0525d8f574286a00b94d686ac57e93a7712 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Mon, 27 Nov 2017 19:23:21 +0100
Subject: [PATCH] In the intro, wait for the derivation to be complete before
 continuing

---
 app/src/main/java/me/impy/aegis/IntroActivity.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/me/impy/aegis/IntroActivity.java b/app/src/main/java/me/impy/aegis/IntroActivity.java
index 50b30aed..2cb61eff 100644
--- a/app/src/main/java/me/impy/aegis/IntroActivity.java
+++ b/app/src/main/java/me/impy/aegis/IntroActivity.java
@@ -109,6 +109,10 @@ public class IntroActivity extends AppIntro implements DerivationTask.Callback {
     @Override
     public void onDonePressed(Fragment currentFragment) {
         super.onDonePressed(currentFragment);
+        // wait for the key derivation background task
+        if (_passwordSlot == null || _passwordCipher == null) {
+            return;
+        }
 
         int cryptType = _authenticatedSlide.getCryptType();