Merge branch '476-blog-sharing-protocol-modifies-state-external-to-session' into 'master' (1d11857e) · Commits · Julian Dehm / briar

Commit 1d11857e authored 8 years ago by akwizgran

Merge branch '476-blog-sharing-protocol-modifies-state-external-to-session' into 'master'

Migrate blog sharing to new sharing client infrastructure

This MR contains a second small commit that fixes #816 and adds a test for it.

Closes #476, #701

See merge request !479

parents d5443e96 5653c6d6

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

briar-api/src/main/java/org/briarproject/briar/api/blog/BlogConstants.java 2 additions, 11 deletions

...n/java/org/briarproject/briar/api/blog/BlogConstants.java
briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationRequest.java 7 additions, 18 deletions

...rg/briarproject/briar/api/blog/BlogInvitationRequest.java
briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationResponse.java 4 additions, 4 deletions

...g/briarproject/briar/api/blog/BlogInvitationResponse.java
briar-api/src/main/java/org/briarproject/briar/api/blog/BlogManager.java 10 additions, 0 deletions

...ain/java/org/briarproject/briar/api/blog/BlogManager.java
briar-api/src/main/java/org/briarproject/briar/api/blog/BlogSharingMessage.java 0 additions, 74 deletions

...a/org/briarproject/briar/api/blog/BlogSharingMessage.java
briar-api/src/main/java/org/briarproject/briar/api/blog/event/BlogInvitationRequestReceivedEvent.java 1 addition, 1 deletion

...ar/api/blog/event/BlogInvitationRequestReceivedEvent.java
briar-api/src/main/java/org/briarproject/briar/api/forum/ForumSharingMessage.java 0 additions, 79 deletions

...org/briarproject/briar/api/forum/ForumSharingMessage.java
briar-api/src/main/java/org/briarproject/briar/api/forum/event/ForumInvitationRequestReceivedEvent.java 2 additions, 2 deletions

.../api/forum/event/ForumInvitationRequestReceivedEvent.java
briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationFactory.java 0 additions, 11 deletions

...org/briarproject/briar/api/sharing/InvitationFactory.java
briar-api/src/main/java/org/briarproject/briar/api/sharing/SharingConstants.java 0 additions, 64 deletions

.../org/briarproject/briar/api/sharing/SharingConstants.java
briar-api/src/main/java/org/briarproject/briar/api/sharing/SharingMessage.java 0 additions, 145 deletions

...va/org/briarproject/briar/api/sharing/SharingMessage.java
briar-core/src/main/java/org/briarproject/briar/blog/BlogManagerImpl.java 31 additions, 8 deletions

...ain/java/org/briarproject/briar/blog/BlogManagerImpl.java
briar-core/src/main/java/org/briarproject/briar/sharing/BlogInvitationFactoryImpl.java 40 additions, 0 deletions

...briarproject/briar/sharing/BlogInvitationFactoryImpl.java
briar-core/src/main/java/org/briarproject/briar/sharing/BlogInviteeSessionState.java 0 additions, 47 deletions

...g/briarproject/briar/sharing/BlogInviteeSessionState.java
briar-core/src/main/java/org/briarproject/briar/sharing/BlogMessageParserImpl.java 39 additions, 0 deletions

...org/briarproject/briar/sharing/BlogMessageParserImpl.java
briar-core/src/main/java/org/briarproject/briar/sharing/BlogProtocolEngineImpl.java 89 additions, 0 deletions

...rg/briarproject/briar/sharing/BlogProtocolEngineImpl.java
briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharerSessionState.java 0 additions, 49 deletions

...rg/briarproject/briar/sharing/BlogSharerSessionState.java
briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharingManagerImpl.java 20 additions, 320 deletions

...rg/briarproject/briar/sharing/BlogSharingManagerImpl.java
briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharingValidator.java 27 additions, 66 deletions

.../org/briarproject/briar/sharing/BlogSharingValidator.java
briar-core/src/main/java/org/briarproject/briar/sharing/ForumInvitationFactoryImpl.java 2 additions, 1 deletion

...riarproject/briar/sharing/ForumInvitationFactoryImpl.java

with 274 additions and 900 deletions

Please register or to comment