Merge branch '617-protocol-versioning-for-contact-exchange' into 'master' (d5643d8e) · Commits · briar / briar

Commit d5643d8e authored 6 years ago by akwizgran

Merge branch '617-protocol-versioning-for-contact-exchange' into 'master'

Protocol versioning for the contact exchange protocol

Closes #617

See merge request akwizgran/briar!765

parents edee90db 30bfa91f

No related branches found

No related tags found

Checking pipeline status

Hide whitespace changes

Inline Side-by-side

Showing

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

...briarproject/bramble/api/contact/ContactExchangeTask.java
bramble-api/src/main/java/org/briarproject/bramble/api/contact/RecordTypes.java 9 additions, 0 deletions

...ava/org/briarproject/bramble/api/contact/RecordTypes.java
bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfDictionary.java 2 additions, 2 deletions

...java/org/briarproject/bramble/api/data/BdfDictionary.java
bramble-api/src/main/java/org/briarproject/bramble/api/record/Record.java 36 additions, 0 deletions

...main/java/org/briarproject/bramble/api/record/Record.java
bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordReader.java 20 additions, 0 deletions

...ava/org/briarproject/bramble/api/record/RecordReader.java
bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordReaderFactory.java 8 additions, 0 deletions

.../briarproject/bramble/api/record/RecordReaderFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordWriter.java 15 additions, 0 deletions

...ava/org/briarproject/bramble/api/record/RecordWriter.java
bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordWriterFactory.java 8 additions, 0 deletions

.../briarproject/bramble/api/record/RecordWriterFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageFactory.java 2 additions, 0 deletions

...ava/org/briarproject/bramble/api/sync/MessageFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncConstants.java 3 additions, 11 deletions

...java/org/briarproject/bramble/api/sync/SyncConstants.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReader.java 1 addition, 1 deletion

...a/org/briarproject/bramble/api/sync/SyncRecordReader.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReaderFactory.java 2 additions, 2 deletions

...riarproject/bramble/api/sync/SyncRecordReaderFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriter.java 1 addition, 1 deletion

...a/org/briarproject/bramble/api/sync/SyncRecordWriter.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriterFactory.java 2 additions, 2 deletions

...riarproject/bramble/api/sync/SyncRecordWriterFactory.java
bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java 2 additions, 0 deletions

...main/java/org/briarproject/bramble/BrambleCoreModule.java
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeTaskImpl.java 129 additions, 136 deletions

...briarproject/bramble/contact/ContactExchangeTaskImpl.java
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementConnector.java 11 additions, 2 deletions

...arproject/bramble/keyagreement/KeyAgreementConnector.java
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskImpl.java 7 additions, 2 deletions

...iarproject/bramble/keyagreement/KeyAgreementTaskImpl.java
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTransport.java 27 additions, 56 deletions

...arproject/bramble/keyagreement/KeyAgreementTransport.java
bramble-core/src/main/java/org/briarproject/bramble/record/RecordModule.java 21 additions, 0 deletions

...in/java/org/briarproject/bramble/record/RecordModule.java

with 308 additions and 217 deletions

Please register or to comment