From 0f439506bd3a767c64950247051de9d4d1ab88fb Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Fri, 10 Jul 2020 20:55:36 +0200
Subject: [PATCH] Insert a state sanity check at the end of the intro

This is a temporary 'fix' for a rare issue where the intro could end up in a bad state
---
 app/src/main/assets/changelog.html            |  5 ++++
 .../aegis/ui/IntroActivity.java               | 28 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
index 546c8a23..4112e6fc 100644
--- a/app/src/main/assets/changelog.html
+++ b/app/src/main/assets/changelog.html
@@ -31,6 +31,11 @@
     </head>
     <body>
         <div></div>
+        <h3>Version 1.2.1</h3>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Fix a rare issue where the intro could end up in a bad state</li>
+        </ul>
         <h3>Version 1.2</h3>
         <h4>New</h4>
         <ul>
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java
index 73c2af15..204951f5 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java
@@ -8,20 +8,27 @@ import androidx.fragment.app.Fragment;
 import com.beemdevelopment.aegis.AegisApplication;
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.ui.slides.SecuritySetupSlide;
 import com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide;
+import com.beemdevelopment.aegis.ui.slides.SecuritySetupSlide;
 import com.beemdevelopment.aegis.vault.Vault;
 import com.beemdevelopment.aegis.vault.VaultFile;
 import com.beemdevelopment.aegis.vault.VaultFileCredentials;
 import com.beemdevelopment.aegis.vault.VaultFileException;
 import com.beemdevelopment.aegis.vault.VaultManager;
 import com.beemdevelopment.aegis.vault.VaultManagerException;
+import com.beemdevelopment.aegis.vault.slots.BiometricSlot;
+import com.beemdevelopment.aegis.vault.slots.PasswordSlot;
 import com.github.appintro.AppIntro2;
 import com.github.appintro.AppIntroFragment;
 import com.github.appintro.model.SliderPage;
 
 import org.json.JSONObject;
 
+import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_BIOMETRIC;
+import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_INVALID;
+import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_NONE;
+import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_PASS;
+
 public class IntroActivity extends AppIntro2 {
     private SecuritySetupSlide securitySetupSlide;
     private SecurityPickerSlide _securityPickerSlide;
@@ -76,8 +83,8 @@ public class IntroActivity extends AppIntro2 {
     public void onSlideChanged(Fragment oldFragment, Fragment newFragment) {
         if (oldFragment == _securityPickerSlide && newFragment != _endSlide) {
             // skip to the last slide if no encryption will be used
-            int cryptType = getIntent().getIntExtra("cryptType", SecurityPickerSlide.CRYPT_TYPE_INVALID);
-            if (cryptType == SecurityPickerSlide.CRYPT_TYPE_NONE) {
+            int cryptType = getIntent().getIntExtra("cryptType", CRYPT_TYPE_INVALID);
+            if (cryptType == CRYPT_TYPE_NONE) {
                 // TODO: no magic indices
                 goToNextSlide(false);
             }
@@ -96,12 +103,23 @@ public class IntroActivity extends AppIntro2 {
 
         int cryptType = securitySetupSlide.getCryptType();
         VaultFileCredentials creds = securitySetupSlide.getCredentials();
+        if (cryptType == CRYPT_TYPE_INVALID
+                || (cryptType == CRYPT_TYPE_NONE && creds != null)
+                || (cryptType == CRYPT_TYPE_PASS && (creds == null || !creds.getSlots().has(PasswordSlot.class)))
+                || (cryptType == CRYPT_TYPE_BIOMETRIC && (creds == null || !creds.getSlots().has(PasswordSlot.class) || !creds.getSlots().has(BiometricSlot.class)))) {
+            Dialogs.showErrorDialog(this, R.string.intro_crypto_error, String.format("State of SecuritySetupSlide not properly propagated, cryptType: %d, creds: %s", cryptType, creds), (dialog, which) -> finishIntro(CRYPT_TYPE_NONE, null));
+            return;
+        }
+
+        finishIntro(cryptType, creds);
+    }
 
+    private void finishIntro(int cryptType, VaultFileCredentials creds) {
         Vault vault = new Vault();
         VaultFile vaultFile = new VaultFile();
         try {
             JSONObject obj = vault.toJson();
-            if (cryptType == SecurityPickerSlide.CRYPT_TYPE_NONE) {
+            if (cryptType == CRYPT_TYPE_NONE) {
                 vaultFile.setContent(obj);
             } else {
                 vaultFile.setContent(obj, creds);
@@ -114,7 +132,7 @@ public class IntroActivity extends AppIntro2 {
             return;
         }
 
-        if (cryptType == SecurityPickerSlide.CRYPT_TYPE_NONE) {
+        if (cryptType == CRYPT_TYPE_NONE) {
             _app.initVaultManager(vault, null);
         } else {
             _app.initVaultManager(vault, creds);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db8ff01c..05dfacf0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -154,6 +154,7 @@
     <string name="choose_application">Select the application you\'d like to import from</string>
     <string name="choose_theme">Select your desired theme</string>
     <string name="choose_view_mode">Select your desired view mode</string>
+    <string name="intro_crypto_error">An error occurred while trying to set up encryption for your vault. Please try setting up encryption manually in the settings menu of Aegis.</string>
     <string name="parsing_file_error">An error occurred while trying to parse the file</string>
     <string name="file_not_found">Error: File not found</string>
     <string name="reading_file_error">An error occurred while trying to read the file</string>
