Merge branch '72-duplicate-contacts' into 'main' (5a538d1b) · Commits · briar / Briar Mailbox · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Briar Mailbox
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

5a538d1b

Commit 5a538d1b authored 3 years ago by Sebastian

Downloads
- Plain Diff

Merge branch '72-duplicate-contacts' into 'main'

Add a PRIMARY_KEY for contactId

Closes #72

See merge request !45

parents 985b7dc6 c59078e1

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

mailbox-core/src/main/java/org/briarproject/mailbox/core/db/Database.kt 4 additions, 0 deletions

...rc/main/java/org/briarproject/mailbox/core/db/Database.kt
mailbox-core/src/main/java/org/briarproject/mailbox/core/db/JdbcDatabase.kt 2 additions, 1 deletion

...ain/java/org/briarproject/mailbox/core/db/JdbcDatabase.kt
mailbox-core/src/test/java/org/briarproject/mailbox/core/contacts/ContactsManagerIntegrationTest.kt 15 additions, 3 deletions

...t/mailbox/core/contacts/ContactsManagerIntegrationTest.kt
mailbox-core/src/test/java/org/briarproject/mailbox/core/db/JdbcDatabaseTest.kt 13 additions, 0 deletions

...java/org/briarproject/mailbox/core/db/JdbcDatabaseTest.kt
mailbox-core/src/test/java/org/briarproject/mailbox/core/settings/MetadataRouteManagerTest.kt 8 additions, 0 deletions

...project/mailbox/core/settings/MetadataRouteManagerTest.kt

with 42 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