Request storage permissions in the intro

This commit is contained in:
Alexander Bakker 2017-12-13 17:59:06 +01:00
parent c3f16c2428
commit 03d0eb01f4
6 changed files with 8 additions and 18 deletions

View file

@ -10,7 +10,6 @@
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/cli" />
</set> </set>
</option> </option>
<option name="resolveModulePerSourceSet" value="false" /> <option name="resolveModulePerSourceSet" value="false" />

View file

@ -4,7 +4,6 @@
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/Aegis.iml" filepath="$PROJECT_DIR$/Aegis.iml" /> <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$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/cli/cli.iml" filepath="$PROJECT_DIR$/cli/cli.iml" />
</modules> </modules>
</component> </component>
</project> </project>

View file

@ -53,11 +53,16 @@ public class IntroActivity extends AppIntro implements DerivationTask.Callback {
SliderPage permSliderPage = new SliderPage(); SliderPage permSliderPage = new SliderPage();
permSliderPage.setTitle("Permissions"); 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.setImageDrawable(R.drawable.intro_scanner);
permSliderPage.setBgColor(getResources().getColor(R.color.colorAccent)); permSliderPage.setBgColor(getResources().getColor(R.color.colorAccent));
addSlide(AppIntroFragment.newInstance(permSliderPage)); 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 = new CustomAuthenticationSlide();
_authenticationSlide.setBgColor(getResources().getColor(R.color.colorHeaderSuccess)); _authenticationSlide.setBgColor(getResources().getColor(R.color.colorHeaderSuccess));

View file

@ -1,6 +0,0 @@
apply plugin: 'java-library'
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
compile "com.beust:jcommander:1.71"
}

View file

@ -1,7 +0,0 @@
package me.impy.aegis.cli;
public class Main {
public static void main(String[] args) {
}
}

View file

@ -1 +1 @@
include ':app', ':cli' include ':app'