Merge branch '474-introduction-client' into 'master' (31b69577) · Commits · Julian Dehm / briar

Commit 31b69577 authored 6 years ago by Torsten Grote

Merge branch '474-introduction-client' into 'master'

New Introduction Protocol

Closes #308, #377, #474, and #613

See merge request akwizgran/briar!758

parents f78f0652 99dba69c

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/crypto/CryptoConstants.java 6 additions, 0 deletions

.../org/briarproject/bramble/api/crypto/CryptoConstants.java
bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java 2 additions, 0 deletions

...c/main/java/org/briarproject/bramble/db/JdbcDatabase.java
bramble-core/src/test/java/org/briarproject/bramble/test/ValidatorTestCase.java 24 additions, 8 deletions

...java/org/briarproject/bramble/test/ValidatorTestCase.java
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java 10 additions, 6 deletions

...arproject/briar/android/contact/ConversationActivity.java
briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java 28 additions, 13 deletions

...iar/android/introduction/IntroductionMessageFragment.java
briar-android/src/main/res/layout/introduction_message.xml 13 additions, 1 deletion

briar-android/src/main/res/layout/introduction_message.xml
briar-android/src/main/res/values/strings.xml 1 addition, 0 deletions

briar-android/src/main/res/values/strings.xml
briar-api/src/main/java/org/briarproject/briar/api/client/MessageQueueManager.java 0 additions, 72 deletions

...rg/briarproject/briar/api/client/MessageQueueManager.java
briar-api/src/main/java/org/briarproject/briar/api/client/ProtocolEngine.java 0 additions, 50 deletions

...ava/org/briarproject/briar/api/client/ProtocolEngine.java
briar-api/src/main/java/org/briarproject/briar/api/client/QueueMessage.java 0 additions, 31 deletions

.../java/org/briarproject/briar/api/client/QueueMessage.java
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroduceeAction.java 0 additions, 53 deletions

...briarproject/briar/api/introduction/IntroduceeAction.java
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroduceeProtocolState.java 0 additions, 82 deletions

...oject/briar/api/introduction/IntroduceeProtocolState.java
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroducerAction.java 0 additions, 54 deletions

...briarproject/briar/api/introduction/IntroducerAction.java
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroducerProtocolState.java 0 additions, 108 deletions

...oject/briar/api/introduction/IntroducerProtocolState.java
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionConstants.java 12 additions, 109 deletions

...project/briar/api/introduction/IntroductionConstants.java
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionManager.java 7 additions, 12 deletions

...arproject/briar/api/introduction/IntroductionManager.java
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionMessage.java 4 additions, 4 deletions

...arproject/briar/api/introduction/IntroductionMessage.java
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionRequest.java 5 additions, 12 deletions

...arproject/briar/api/introduction/IntroductionRequest.java
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionResponse.java 2 additions, 10 deletions

...rproject/briar/api/introduction/IntroductionResponse.java
briar-api/src/main/java/org/briarproject/briar/api/introduction/Role.java 29 additions, 0 deletions

...in/java/org/briarproject/briar/api/introduction/Role.java

with 143 additions and 625 deletions

Please register or to comment