From 03d0eb01f420b2da2ac24dc837c1ff4202bba3bb Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Wed, 13 Dec 2017 17:59:06 +0100
Subject: [PATCH] Request storage permissions in the intro

---
 .idea/gradle.xml                                   | 1 -
 .idea/modules.xml                                  | 1 -
 app/src/main/java/me/impy/aegis/IntroActivity.java | 9 +++++++--
 cli/build.gradle                                   | 6 ------
 cli/src/main/java/me/impy/aegis/cli/Main.java      | 7 -------
 settings.gradle                                    | 2 +-
 6 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 cli/build.gradle
 delete mode 100644 cli/src/main/java/me/impy/aegis/cli/Main.java

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index c8e1a015..8ca4b4b3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -10,7 +10,6 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/cli" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 0f184f57..628ff456 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,7 +4,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Aegis.iml" filepath="$PROJECT_DIR$/Aegis.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/cli/cli.iml" filepath="$PROJECT_DIR$/cli/cli.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/me/impy/aegis/IntroActivity.java b/app/src/main/java/me/impy/aegis/IntroActivity.java
index 8fa4419d..a1977ceb 100644
--- a/app/src/main/java/me/impy/aegis/IntroActivity.java
+++ b/app/src/main/java/me/impy/aegis/IntroActivity.java
@@ -53,11 +53,16 @@ public class IntroActivity extends AppIntro implements DerivationTask.Callback {
 
         SliderPage permSliderPage = new SliderPage();
         permSliderPage.setTitle("Permissions");
-        permSliderPage.setDescription("Aegis needs permission to use your camera in order to scan QR codes.");
+        permSliderPage.setDescription("Aegis needs permission to use your camera in order to scan QR codes. " +
+                "It also needs access to external storage to able to export the database.");
         permSliderPage.setImageDrawable(R.drawable.intro_scanner);
         permSliderPage.setBgColor(getResources().getColor(R.color.colorAccent));
         addSlide(AppIntroFragment.newInstance(permSliderPage));
-        askForPermissions(new String[]{Manifest.permission.CAMERA}, 2);
+        askForPermissions(new String[]{
+                Manifest.permission.CAMERA,
+                Manifest.permission.READ_EXTERNAL_STORAGE,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE
+        }, 2);
 
         _authenticationSlide = new CustomAuthenticationSlide();
         _authenticationSlide.setBgColor(getResources().getColor(R.color.colorHeaderSuccess));
diff --git a/cli/build.gradle b/cli/build.gradle
deleted file mode 100644
index adb09f5c..00000000
--- a/cli/build.gradle
+++ /dev/null
@@ -1,6 +0,0 @@
-apply plugin: 'java-library'
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    compile "com.beust:jcommander:1.71"
-}
diff --git a/cli/src/main/java/me/impy/aegis/cli/Main.java b/cli/src/main/java/me/impy/aegis/cli/Main.java
deleted file mode 100644
index 9e1add3d..00000000
--- a/cli/src/main/java/me/impy/aegis/cli/Main.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package me.impy.aegis.cli;
-
-public class Main {
-    public static void main(String[] args) {
-
-    }
-}
diff --git a/settings.gradle b/settings.gradle
index 06c4f77b..e7b4def4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':cli'
+include ':app'