Merge branch 'master' into '941-store-correct-parent-id' (5b05424d) · Commits · Julian Dehm / briar

Commit 5b05424d authored 7 years ago by akwizgran

Merge branch 'master' into '941-store-correct-parent-id'

# Conflicts:
#   briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java

parents 76a5e256 0826022d

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 20 additions, 0 deletions

.gitlab-ci.yml
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java 1 addition, 0 deletions

...ava/org/briarproject/bramble/api/plugin/TorConstants.java
bramble-api/src/main/java/org/briarproject/bramble/util/PrivacyUtils.java 1 addition, 1 deletion

...main/java/org/briarproject/bramble/util/PrivacyUtils.java
bramble-core/src/main/java/org/briarproject/bramble/socks/SocksModule.java 3 additions, 1 deletion

...main/java/org/briarproject/bramble/socks/SocksModule.java
bramble-core/src/main/java/org/briarproject/bramble/socks/SocksSocket.java 9 additions, 7 deletions

...main/java/org/briarproject/bramble/socks/SocksSocket.java
bramble-core/src/main/java/org/briarproject/bramble/socks/SocksSocketFactory.java 5 additions, 3 deletions

...va/org/briarproject/bramble/socks/SocksSocketFactory.java
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 8 additions, 9 deletions

...project/briar/android/AndroidNotificationManagerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/BriarService.java 1 addition, 3 deletions

...ain/java/org/briarproject/briar/android/BriarService.java
briar-android/src/main/java/org/briarproject/briar/android/ScreenFilterMonitorImpl.java 82 additions, 32 deletions

...g/briarproject/briar/android/ScreenFilterMonitorImpl.java
briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java 1 addition, 1 deletion

...rg/briarproject/briar/android/activity/BriarActivity.java
briar-android/src/main/java/org/briarproject/briar/android/blog/BlogActivity.java 1 addition, 1 deletion

...ava/org/briarproject/briar/android/blog/BlogActivity.java
briar-android/src/main/java/org/briarproject/briar/android/blog/BlogControllerImpl.java 1 addition, 1 deletion

...g/briarproject/briar/android/blog/BlogControllerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java 2 additions, 3 deletions

...ava/org/briarproject/briar/android/blog/BlogFragment.java
briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java 2 additions, 1 deletion

...rproject/briar/android/contact/ContactItemViewHolder.java
briar-android/src/main/java/org/briarproject/briar/android/controller/DbControllerImpl.java 1 addition, 1 deletion

...iarproject/briar/android/controller/DbControllerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java 1 addition, 2 deletions

...oject/briar/android/controller/SharingControllerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java 2 additions, 6 deletions

...a/org/briarproject/briar/android/forum/ForumActivity.java
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java 3 additions, 2 deletions

...briarproject/briar/android/forum/ForumControllerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/fragment/SFDialogFragment.java 2 additions, 1 deletion

...briarproject/briar/android/fragment/SFDialogFragment.java

with 149 additions and 75 deletions

Please register or to comment