Merge branch '1281-introduction-bug' into 'master' (9dae3d19) · 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

9dae3d19

Commit 9dae3d19 authored 6 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '1281-introduction-bug' into 'master'

Introduction: Reset session information for removed introducees

Closes #1281

See merge request akwizgran/briar!813

parents f8bc5f08 20422edf

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerProtocolEngine.java 20 additions, 2 deletions

...rproject/briar/introduction/IntroducerProtocolEngine.java
briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerSession.java 1 addition, 1 deletion

...rg/briarproject/briar/introduction/IntroducerSession.java
briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java 2 additions, 1 deletion

...arproject/briar/introduction/IntroductionManagerImpl.java
briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java 47 additions, 0 deletions

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

with 70 additions and 4 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