Merge branch '748-qr-code-payload-order' into 'master'
Preserve the order of descriptors in QR code payloads This fixes a regression caused by my recent changes to the Payload class. Closes #748 See merge request !399
Showing
- briar-api/src/org/briarproject/api/keyagreement/Payload.java 4 additions, 6 deletionsbriar-api/src/org/briarproject/api/keyagreement/Payload.java
- briar-api/src/org/briarproject/api/keyagreement/TransportDescriptor.java 28 additions, 0 deletions...rg/briarproject/api/keyagreement/TransportDescriptor.java
- briar-core/src/org/briarproject/keyagreement/KeyAgreementConnector.java 8 additions, 11 deletions.../org/briarproject/keyagreement/KeyAgreementConnector.java
- briar-core/src/org/briarproject/keyagreement/KeyAgreementProtocol.java 36 additions, 34 deletions...c/org/briarproject/keyagreement/KeyAgreementProtocol.java
- briar-core/src/org/briarproject/keyagreement/PayloadEncoderImpl.java 3 additions, 6 deletions...src/org/briarproject/keyagreement/PayloadEncoderImpl.java
- briar-core/src/org/briarproject/keyagreement/PayloadParserImpl.java 9 additions, 6 deletions.../src/org/briarproject/keyagreement/PayloadParserImpl.java
Loading
Please register or sign in to comment