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

66652357

Commit 66652357 authored 6 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '1232-pending-contact-states' into 'master'

Add ContactManager support for pending contact states

See merge request !1122

parents b9283ea6 64ae99bb

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java 71 additions, 6 deletions

.../org/briarproject/bramble/contact/ContactManagerImpl.java
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactModule.java 4 additions, 1 deletion

.../java/org/briarproject/bramble/contact/ContactModule.java
bramble-core/src/test/java/org/briarproject/bramble/contact/ContactManagerImplTest.java 201 additions, 14 deletions

.../briarproject/bramble/contact/ContactManagerImplTest.java
bramble-core/src/test/java/org/briarproject/bramble/test/PredicateMatcher.java 28 additions, 0 deletions

.../java/org/briarproject/bramble/test/PredicateMatcher.java

with 304 additions and 21 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