Merge branch '617-protocol-versioning' into 'master' (c80edc99) · Commits · Julian Dehm / briar

Commit c80edc99 authored 7 years ago by Torsten Grote

Merge branch '617-protocol-versioning' into 'master'

Protocol versioning

See merge request !646

parents 33378d99 f2f98f28

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupFactory.java 5 additions, 4 deletions

.../briarproject/bramble/api/client/ContactGroupFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeTask.java 5 additions, 0 deletions

...briarproject/bramble/api/contact/ContactExchangeTask.java
bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java 2 additions, 2 deletions

.../org/briarproject/bramble/api/crypto/CryptoComponent.java
bramble-api/src/main/java/org/briarproject/bramble/api/properties/TransportPropertyManager.java 5 additions, 0 deletions

...ject/bramble/api/properties/TransportPropertyManager.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupFactory.java 2 additions, 2 deletions

.../java/org/briarproject/bramble/api/sync/GroupFactory.java
bramble-core/src/main/java/org/briarproject/bramble/client/ContactGroupFactoryImpl.java 9 additions, 7 deletions

.../briarproject/bramble/client/ContactGroupFactoryImpl.java
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeTaskImpl.java 12 additions, 9 deletions

...briarproject/bramble/contact/ContactExchangeTaskImpl.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java 8 additions, 11 deletions

.../org/briarproject/bramble/crypto/CryptoComponentImpl.java
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocol.java 9 additions, 1 deletion

...iarproject/bramble/keyagreement/KeyAgreementProtocol.java
bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyManagerImpl.java 4 additions, 2 deletions

...ject/bramble/properties/TransportPropertyManagerImpl.java
bramble-core/src/main/java/org/briarproject/bramble/sync/GroupFactoryImpl.java 11 additions, 3 deletions

.../java/org/briarproject/bramble/sync/GroupFactoryImpl.java
bramble-core/src/main/java/org/briarproject/bramble/sync/MessageFactoryImpl.java 5 additions, 3 deletions

...ava/org/briarproject/bramble/sync/MessageFactoryImpl.java
bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyAgreementTest.java 9 additions, 2 deletions

...ava/org/briarproject/bramble/crypto/KeyAgreementTest.java
bramble-core/src/test/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocolTest.java 23 additions, 5 deletions

...roject/bramble/keyagreement/KeyAgreementProtocolTest.java
bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java 21 additions, 10 deletions

.../bramble/properties/TransportPropertyManagerImplTest.java
bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java 5 additions, 3 deletions

...va/org/briarproject/bramble/sync/SyncIntegrationTest.java
briar-api/src/main/java/org/briarproject/briar/api/blog/BlogManager.java 6 additions, 1 deletion

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

...a/org/briarproject/briar/api/blog/BlogSharingManager.java
briar-api/src/main/java/org/briarproject/briar/api/feed/FeedManager.java 5 additions, 0 deletions

...ain/java/org/briarproject/briar/api/feed/FeedManager.java
briar-api/src/main/java/org/briarproject/briar/api/forum/ForumManager.java 5 additions, 0 deletions

...n/java/org/briarproject/briar/api/forum/ForumManager.java

with 158 additions and 65 deletions

Please register or to comment