Merge branch '118-contact-introductions' into 'master'
Contact Introduction Backend This MR allows you to introduce two of your contacts to each other. They both will receive an introduction with an optional message and then can accept or refuse the introduction which is presented as a notification. When reviewing, I propose to review the individual commits separately as I took great care to split functional independent parts into separate commits. You might also want to have a look at the [Introduction Client Wiki page](https://code.briarproject.org/akwizgran/briar/wikis/IntroductionClient) to better understand what is going on before looking into the actual code. Protocol sessions and states are not yet deleted and the UI is still missing (#253). In order to practically test this feature, the UI from !122 is needed. See merge request !116
Showing
- briar-api/src/org/briarproject/api/ProtocolEngine.java 31 additions, 0 deletionsbriar-api/src/org/briarproject/api/ProtocolEngine.java
- briar-api/src/org/briarproject/api/contact/ContactManager.java 19 additions, 2 deletions...-api/src/org/briarproject/api/contact/ContactManager.java
- briar-api/src/org/briarproject/api/db/DatabaseComponent.java 7 additions, 0 deletionsbriar-api/src/org/briarproject/api/db/DatabaseComponent.java
- briar-api/src/org/briarproject/api/event/ContactAddedEvent.java 7 additions, 1 deletion...api/src/org/briarproject/api/event/ContactAddedEvent.java
- briar-api/src/org/briarproject/api/event/IntroductionRequestReceivedEvent.java 26 additions, 0 deletions...arproject/api/event/IntroductionRequestReceivedEvent.java
- briar-api/src/org/briarproject/api/event/IntroductionResponseReceivedEvent.java 25 additions, 0 deletions...rproject/api/event/IntroductionResponseReceivedEvent.java
- briar-api/src/org/briarproject/api/event/IntroductionSucceededEvent.java 16 additions, 0 deletions...rg/briarproject/api/event/IntroductionSucceededEvent.java
- briar-api/src/org/briarproject/api/event/MessageValidatedEvent.java 1 addition, 0 deletions...src/org/briarproject/api/event/MessageValidatedEvent.java
- briar-api/src/org/briarproject/api/introduction/IntroduceeAction.java 43 additions, 0 deletions...c/org/briarproject/api/introduction/IntroduceeAction.java
- briar-api/src/org/briarproject/api/introduction/IntroduceeProtocolState.java 76 additions, 0 deletions...riarproject/api/introduction/IntroduceeProtocolState.java
- briar-api/src/org/briarproject/api/introduction/IntroducerAction.java 46 additions, 0 deletions...c/org/briarproject/api/introduction/IntroducerAction.java
- briar-api/src/org/briarproject/api/introduction/IntroducerProtocolState.java 94 additions, 0 deletions...riarproject/api/introduction/IntroducerProtocolState.java
- briar-api/src/org/briarproject/api/introduction/IntroductionConstants.java 68 additions, 0 deletions.../briarproject/api/introduction/IntroductionConstants.java
- briar-api/src/org/briarproject/api/introduction/IntroductionManager.java 62 additions, 0 deletions...rg/briarproject/api/introduction/IntroductionManager.java
- briar-api/src/org/briarproject/api/introduction/IntroductionMessage.java 54 additions, 0 deletions...rg/briarproject/api/introduction/IntroductionMessage.java
- briar-api/src/org/briarproject/api/introduction/IntroductionRequest.java 36 additions, 0 deletions...rg/briarproject/api/introduction/IntroductionRequest.java
- briar-api/src/org/briarproject/api/introduction/IntroductionResponse.java 31 additions, 0 deletions...g/briarproject/api/introduction/IntroductionResponse.java
- briar-api/src/org/briarproject/api/introduction/SessionId.java 19 additions, 0 deletions...-api/src/org/briarproject/api/introduction/SessionId.java
- briar-api/src/org/briarproject/api/properties/TransportPropertyManager.java 2 additions, 1 deletion...briarproject/api/properties/TransportPropertyManager.java
- briar-core/src/org/briarproject/CoreEagerSingletons.java 2 additions, 0 deletionsbriar-core/src/org/briarproject/CoreEagerSingletons.java
Loading
Please register or sign in to comment