Merge branch '474-manual-decline' into 'master' (ebf73716) · 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

ebf73716

Commit ebf73716 authored 6 years ago by Torsten Grote

Downloads
- Plain Diff

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

Don't automatically respond to declined introductions

See merge request akwizgran/briar!777

parents e8f33c0e 6e42377b

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 0 additions, 24 deletions

...arproject/briar/android/contact/ConversationActivity.java
briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java 43 additions, 36 deletions

...rproject/briar/introduction/IntroduceeProtocolEngine.java
briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeState.java 5 additions, 4 deletions

.../org/briarproject/briar/introduction/IntroduceeState.java
briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java 23 additions, 78 deletions

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

with 71 additions and 142 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