Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
briar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
briar
Merge requests
!646
Protocol versioning
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Protocol versioning
617-protocol-versioning
into
master
Overview
2
Commits
5
Pipelines
2
Changes
46
Merged
akwizgran
requested to merge
617-protocol-versioning
into
master
7 years ago
Overview
2
Commits
5
Pipelines
2
Changes
46
Expand
Second part of
#617 (closed)
.
1
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
f2f98f28
5 commits,
7 years ago
46 files
+
312
−
124
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
46
Search (e.g. *.vue) (Ctrl+P)
bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupFactory.java
+
5
−
4
Options
@@ -12,18 +12,19 @@ public interface ContactGroupFactory {
/**
* Creates a group that is not shared with any contacts.
*/
Group
createLocalGroup
(
ClientId
clientId
);
Group
createLocalGroup
(
ClientId
clientId
,
int
clientVersion
);
/**
* Creates a group for the given client to share with the given contact.
*/
Group
createContactGroup
(
ClientId
clientId
,
Contact
contact
);
Group
createContactGroup
(
ClientId
clientId
,
int
clientVersion
,
Contact
contact
);
/**
* Creates a group for the given client to share between the given authors
* identified by their AuthorIds.
*/
Group
createContactGroup
(
ClientId
clientId
,
AuthorId
authorId1
,
AuthorId
authorId2
);
Group
createContactGroup
(
ClientId
clientId
,
int
clientVersion
,
AuthorId
authorId1
,
AuthorId
authorId2
);
}
Loading