Merge branch '1085-startup-wizard' into 'master' (df99b3b6) · Commits · Julian Dehm / briar

Commit df99b3b6 authored 7 years ago by akwizgran

Merge branch '1085-startup-wizard' into 'master'

Setup Wizard that asks for Doze Mode exception

Closes #1085 and #1018

See merge request !603

parents 1c4f20f7 0f1c9f4f

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/build.gradle 4 additions, 0 deletions

briar-android/build.gradle
briar-android/src/main/AndroidManifest.xml 1 addition, 0 deletions

briar-android/src/main/AndroidManifest.xml
briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java 7 additions, 0 deletions

...riarproject/briar/android/activity/ActivityComponent.java
briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java 18 additions, 0 deletions

...org/briarproject/briar/android/activity/BaseActivity.java
briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java 0 additions, 17 deletions

...rg/briarproject/briar/android/activity/BriarActivity.java
briar-android/src/main/java/org/briarproject/briar/android/activity/RequestCodes.java 8 additions, 8 deletions

...org/briarproject/briar/android/activity/RequestCodes.java
briar-android/src/main/java/org/briarproject/briar/android/login/AuthorNameFragment.java 82 additions, 0 deletions

.../briarproject/briar/android/login/AuthorNameFragment.java
briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordActivity.java 1 addition, 3 deletions

...arproject/briar/android/login/ChangePasswordActivity.java
briar-android/src/main/java/org/briarproject/briar/android/login/DozeFragment.java 94 additions, 0 deletions

...va/org/briarproject/briar/android/login/DozeFragment.java
briar-android/src/main/java/org/briarproject/briar/android/login/PasswordController.java 3 additions, 0 deletions

.../briarproject/briar/android/login/PasswordController.java
briar-android/src/main/java/org/briarproject/briar/android/login/PasswordControllerImpl.java 11 additions, 2 deletions

...arproject/briar/android/login/PasswordControllerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java 116 additions, 0 deletions

...rg/briarproject/briar/android/login/PasswordFragment.java
briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java 22 additions, 115 deletions

...a/org/briarproject/briar/android/login/SetupActivity.java
briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java 18 additions, 2 deletions

...org/briarproject/briar/android/login/SetupController.java
briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java 57 additions, 8 deletions

...briarproject/briar/android/login/SetupControllerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/login/SetupFragment.java 68 additions, 0 deletions

...a/org/briarproject/briar/android/login/SetupFragment.java
briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java 32 additions, 7 deletions

...iarproject/briar/android/navdrawer/NavDrawerActivity.java
briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java 42 additions, 4 deletions

...ain/java/org/briarproject/briar/android/util/UiUtils.java
briar-android/src/main/res/layout/fragment_setup_author_name.xml 60 additions, 0 deletions

...ndroid/src/main/res/layout/fragment_setup_author_name.xml
briar-android/src/main/res/layout/fragment_setup_doze.xml 54 additions, 0 deletions

briar-android/src/main/res/layout/fragment_setup_doze.xml

with 698 additions and 166 deletions

Please register or to comment