Merge branch '628-bring-protocols-into-line-with-spec' into 'master' (79fc4147) · Commits · Julian Dehm / briar

Commit 79fc4147 authored 8 years ago by akwizgran

Merge branch '628-bring-protocols-into-line-with-spec' into 'master'

Bring protocols in line with spec

Closes #628

See merge request !465

parents efb89adf 5345db0b

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/sync/Ack.java 1 addition, 1 deletion

.../src/main/java/org/briarproject/bramble/api/sync/Ack.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/Group.java 4 additions, 0 deletions

...rc/main/java/org/briarproject/bramble/api/sync/Group.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/Offer.java 1 addition, 1 deletion

...rc/main/java/org/briarproject/bramble/api/sync/Offer.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/RecordReader.java 2 additions, 1 deletion

.../java/org/briarproject/bramble/api/sync/RecordReader.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/RecordReaderFactory.java 2 additions, 2 deletions

...rg/briarproject/bramble/api/sync/RecordReaderFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/RecordTypes.java 3 additions, 2 deletions

...n/java/org/briarproject/bramble/api/sync/RecordTypes.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/RecordWriter.java 1 addition, 1 deletion

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

...rg/briarproject/bramble/api/sync/RecordWriterFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/Request.java 1 addition, 1 deletion

.../main/java/org/briarproject/bramble/api/sync/Request.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncConstants.java 14 additions, 11 deletions

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

...n/java/org/briarproject/bramble/api/sync/SyncSession.java
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocol.java 2 additions, 2 deletions

...iarproject/bramble/keyagreement/KeyAgreementProtocol.java
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskImpl.java 1 addition, 1 deletion

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

...arproject/bramble/keyagreement/KeyAgreementTransport.java
bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java 21 additions, 21 deletions

.../org/briarproject/bramble/sync/DuplexOutgoingSession.java
bramble-core/src/main/java/org/briarproject/bramble/sync/IncomingSession.java 15 additions, 14 deletions

...n/java/org/briarproject/bramble/sync/IncomingSession.java
bramble-core/src/main/java/org/briarproject/bramble/sync/MessageFactoryImpl.java 5 additions, 1 deletion

...ava/org/briarproject/bramble/sync/MessageFactoryImpl.java
bramble-core/src/main/java/org/briarproject/bramble/sync/RecordReaderFactoryImpl.java 28 additions, 0 deletions

...rg/briarproject/bramble/sync/RecordReaderFactoryImpl.java
bramble-core/src/main/java/org/briarproject/bramble/sync/RecordReaderImpl.java 60 additions, 43 deletions

.../java/org/briarproject/bramble/sync/RecordReaderImpl.java
bramble-core/src/main/java/org/briarproject/bramble/sync/RecordWriterFactoryImpl.java 16 additions, 0 deletions

...rg/briarproject/bramble/sync/RecordWriterFactoryImpl.java

with 208 additions and 119 deletions

Please register or to comment