From f09d2273781bad09da3d052b80a084620845daeb Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Sun, 26 Nov 2017 19:27:03 +0100
Subject: [PATCH] Start the intro if the database file was not found

---
 .../java/me/impy/aegis/IntroActivity.java     |  1 -
 .../main/java/me/impy/aegis/MainActivity.java | 20 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/me/impy/aegis/IntroActivity.java b/app/src/main/java/me/impy/aegis/IntroActivity.java
index d4236836..3860d5ee 100644
--- a/app/src/main/java/me/impy/aegis/IntroActivity.java
+++ b/app/src/main/java/me/impy/aegis/IntroActivity.java
@@ -159,7 +159,6 @@ public class IntroActivity extends AppIntro {
         setResult(RESULT_OK, result);
 
         // skip the intro from now on
-        // TODO: show the intro if we can't find any database files
         SharedPreferences prefs = this.getSharedPreferences("me.impy.aegis", Context.MODE_PRIVATE);
         prefs.edit().putBoolean("passedIntro", true).apply();
         finish();
diff --git a/app/src/main/java/me/impy/aegis/MainActivity.java b/app/src/main/java/me/impy/aegis/MainActivity.java
index 3996ac7e..68f9a611 100644
--- a/app/src/main/java/me/impy/aegis/MainActivity.java
+++ b/app/src/main/java/me/impy/aegis/MainActivity.java
@@ -26,6 +26,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
+import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.util.ArrayList;
@@ -69,17 +70,22 @@ public class MainActivity extends AppCompatActivity {
         } else {
             try {
                 _db.load();
+                if (!_db.isDecrypted()) {
+                    Intent intent = new Intent(this, AuthActivity.class);
+                    intent.putExtra("slots", _db.getFile().getSlots());
+                    startActivityForResult(intent, CODE_DECRYPT);
+                } else {
+                    loadKeyProfiles();
+                }
+            } catch (FileNotFoundException e) {
+                // start the intro if the db file was not found
+                Toast.makeText(this, "Database file not found, starting over...", Toast.LENGTH_SHORT).show();
+                Intent intro = new Intent(this, IntroActivity.class);
+                startActivityForResult(intro, CODE_DO_INTRO);
             } catch (Exception e) {
                 // TODO: feedback
                 throw new UndeclaredThrowableException(e);
             }
-            if (!_db.isDecrypted()) {
-                Intent intent = new Intent(this, AuthActivity.class);
-                intent.putExtra("slots", _db.getFile().getSlots());
-                startActivityForResult(intent, CODE_DECRYPT);
-            } else {
-                loadKeyProfiles();
-            }
         }
 
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);