Merge branch '891-messages-not-acked' into 'master' (9755cd9a) · Commits · Julian Dehm / briar · GitLab

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

9755cd9a

Commit 9755cd9a authored 8 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '891-messages-not-acked' into 'master'

Fix MessageId calculation for deprecated MessageQueue

Closes #891

See merge request !514

parents 6d2b18fa 85c17b4c

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java 3 additions, 1 deletion

...va/org/briarproject/bramble/db/DatabaseComponentImpl.java
briar-api/src/main/java/org/briarproject/briar/api/client/BaseMessageHeader.java 7 additions, 7 deletions

.../org/briarproject/briar/api/client/BaseMessageHeader.java
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionMessage.java 1 addition, 1 deletion

...arproject/briar/api/introduction/IntroductionMessage.java
briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java 1 addition, 1 deletion

...riarproject/briar/api/messaging/PrivateMessageHeader.java
briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationMessage.java 1 addition, 1 deletion

...org/briarproject/briar/api/sharing/InvitationMessage.java
briar-core/src/main/java/org/briarproject/briar/client/QueueMessageFactoryImpl.java 6 additions, 2 deletions

...rg/briarproject/briar/client/QueueMessageFactoryImpl.java
briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java 35 additions, 8 deletions

...oject/briar/introduction/IntroductionIntegrationTest.java

with 54 additions and 21 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