Merge branch '403-blog-sharing-client' into 'master' (192ee416) · Commits · Julian Dehm / briar

Commit 192ee416 authored 8 years ago by Torsten Grote

Merge branch '403-blog-sharing-client' into 'master'

Implement Blog Sharing Client

Closes #403

See merge request !220

parents 5df2776d 13e3eec6

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

briar-android-tests/src/test/java/org/briarproject/ForumManagerTest.java 6 additions, 4 deletions

...ests/src/test/java/org/briarproject/ForumManagerTest.java
briar-android-tests/src/test/java/org/briarproject/ForumManagerTestComponent.java 4 additions, 0 deletions

...test/java/org/briarproject/ForumManagerTestComponent.java
briar-android-tests/src/test/java/org/briarproject/ForumSharingIntegrationTest.java 35 additions, 33 deletions

...st/java/org/briarproject/ForumSharingIntegrationTest.java
briar-android-tests/src/test/java/org/briarproject/ForumSharingIntegrationTestComponent.java 4 additions, 0 deletions

...rg/briarproject/ForumSharingIntegrationTestComponent.java
briar-android/src/org/briarproject/android/contact/ContactListFragment.java 1 addition, 1 deletion

...org/briarproject/android/contact/ContactListFragment.java
briar-android/src/org/briarproject/android/contact/ConversationActivity.java 1 addition, 1 deletion

...rg/briarproject/android/contact/ConversationActivity.java
briar-android/src/org/briarproject/android/forum/AvailableForumsActivity.java 1 addition, 1 deletion

...g/briarproject/android/forum/AvailableForumsActivity.java
briar-android/src/org/briarproject/android/forum/ContactSelectorFragment.java 1 addition, 1 deletion

...g/briarproject/android/forum/ContactSelectorFragment.java
briar-android/src/org/briarproject/android/forum/ForumListFragment.java 1 addition, 1 deletion

...src/org/briarproject/android/forum/ForumListFragment.java
briar-android/src/org/briarproject/android/forum/ShareForumMessageFragment.java 2 additions, 2 deletions

...briarproject/android/forum/ShareForumMessageFragment.java
briar-api/src/org/briarproject/api/blogs/BlogConstants.java 6 additions, 0 deletions

briar-api/src/org/briarproject/api/blogs/BlogConstants.java
briar-api/src/org/briarproject/api/blogs/BlogInvitationMessage.java 26 additions, 0 deletions

...src/org/briarproject/api/blogs/BlogInvitationMessage.java
briar-api/src/org/briarproject/api/blogs/BlogSharingManager.java 60 additions, 0 deletions

...pi/src/org/briarproject/api/blogs/BlogSharingManager.java
briar-api/src/org/briarproject/api/blogs/BlogSharingMessage.java 89 additions, 0 deletions

...pi/src/org/briarproject/api/blogs/BlogSharingMessage.java
briar-api/src/org/briarproject/api/event/BlogInvitationReceivedEvent.java 18 additions, 0 deletions

...g/briarproject/api/event/BlogInvitationReceivedEvent.java
briar-api/src/org/briarproject/api/event/BlogInvitationResponseReceivedEvent.java 18 additions, 0 deletions

...roject/api/event/BlogInvitationResponseReceivedEvent.java
briar-api/src/org/briarproject/api/event/ForumInvitationReceivedEvent.java 2 additions, 7 deletions

.../briarproject/api/event/ForumInvitationReceivedEvent.java
briar-api/src/org/briarproject/api/event/ForumInvitationResponseReceivedEvent.java 2 additions, 8 deletions

...oject/api/event/ForumInvitationResponseReceivedEvent.java
briar-api/src/org/briarproject/api/event/InvitationReceivedEvent.java 17 additions, 0 deletions

...c/org/briarproject/api/event/InvitationReceivedEvent.java
briar-api/src/org/briarproject/api/event/InvitationResponseReceivedEvent.java 16 additions, 0 deletions

...iarproject/api/event/InvitationResponseReceivedEvent.java

with 310 additions and 59 deletions

Please register or to comment