Commit 03191ff0 authored 7 years ago by akwizgran

Merge branch 'master' into 'preference-switches'

# Conflicts:
#   briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java

parents 30a070dd 42031631

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/build.gradle 16 additions, 16 deletions

briar-android/build.gradle
briar-android/src/main/AndroidManifest.xml 6 additions, 0 deletions

briar-android/src/main/AndroidManifest.xml
briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java 3 additions, 0 deletions

...java/org/briarproject/briar/android/AndroidComponent.java
briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java 48 additions, 5 deletions

...project/briar/android/AndroidNotificationManagerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/AppModule.java 11 additions, 0 deletions

...c/main/java/org/briarproject/briar/android/AppModule.java
briar-android/src/main/java/org/briarproject/briar/android/BriarService.java 7 additions, 21 deletions

...ain/java/org/briarproject/briar/android/BriarService.java
briar-android/src/main/java/org/briarproject/briar/android/TestingConstants.java 5 additions, 0 deletions

...java/org/briarproject/briar/android/TestingConstants.java
briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java 132 additions, 0 deletions

...g/briarproject/briar/android/account/LockManagerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java 3 additions, 0 deletions

...riarproject/briar/android/activity/ActivityComponent.java
briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java 27 additions, 7 deletions

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

...org/briarproject/briar/android/activity/RequestCodes.java
briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java 3 additions, 6 deletions

...rg/briarproject/briar/android/login/PasswordActivity.java
briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java 123 additions, 0 deletions

.../org/briarproject/briar/android/login/UnlockActivity.java
briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java 18 additions, 3 deletions

...iarproject/briar/android/navdrawer/NavDrawerActivity.java
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java 34 additions, 4 deletions

...briarproject/briar/android/settings/SettingsFragment.java
briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java 14 additions, 1 deletion

...iarproject/briar/android/splash/SplashScreenActivity.java
briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java 13 additions, 0 deletions

...ain/java/org/briarproject/briar/android/util/UiUtils.java
briar-android/src/main/java/org/briarproject/briar/api/android/AndroidNotificationManager.java 6 additions, 0 deletions

...project/briar/api/android/AndroidNotificationManager.java
briar-android/src/main/java/org/briarproject/briar/api/android/LockManager.java 33 additions, 0 deletions

.../java/org/briarproject/briar/api/android/LockManager.java
briar-android/src/main/res/layout/activity_unlock.xml 49 additions, 0 deletions

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

with 553 additions and 63 deletions

Please register or to comment