Merge branch '474-automatic-decline' into 'master' (55a329a8) · 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

55a329a8

Commit 55a329a8 authored 6 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '474-automatic-decline' into 'master'

Send automatic decline when other introducee declines

See merge request akwizgran/briar!775

parents 31b69577 23f0864d

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java 44 additions, 43 deletions

...arproject/briar/android/contact/ConversationActivity.java
briar-core/src/main/java/org/briarproject/briar/introduction/AbstractProtocolEngine.java 1 addition, 2 deletions

...iarproject/briar/introduction/AbstractProtocolEngine.java
briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java 16 additions, 3 deletions

...rproject/briar/introduction/IntroduceeProtocolEngine.java
briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerProtocolEngine.java 57 additions, 9 deletions

...rproject/briar/introduction/IntroducerProtocolEngine.java

with 118 additions and 57 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