Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

d395f086

Commit d395f086 authored 7 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '1173-qr-code-version' into 'master'

Use first byte of QR code payload for format version

Closes #1173

See merge request akwizgran/briar!702

parents 363dfbc6 0b781cf2

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConstants.java 2 additions, 2 deletions

...oject/bramble/api/keyagreement/KeyAgreementConstants.java
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadEncoderImpl.java 1 addition, 1 deletion

...briarproject/bramble/keyagreement/PayloadEncoderImpl.java
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java 10 additions, 10 deletions

.../briarproject/bramble/keyagreement/PayloadParserImpl.java

with 13 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment