Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 04:39:54 +01:00
Code Issues Projects Releases Wiki Activity

Rename client version to major version.

Browse Source
This commit is contained in:
akwizgran
2018-04-16 16:35:48 +01:00
parent cadb17987c
commit 2e570ba50d
68 changed files with 296 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-core/src/main/java/org/briarproject/briar/blog/BlogFactoryImpl.java
View File

@@ -15,7 +15,7 @@ import javax.inject.Inject;
import static org.briarproject.bramble.util.ValidationUtils.checkSize;
import static org.briarproject.briar.api.blog.BlogManager.CLIENT_ID;
import static org.briarproject.briar.api.blog.BlogManager.CLIENT_VERSION;
import static org.briarproject.briar.api.blog.BlogManager.MAJOR_VERSION;
@Immutable
@NotNullByDefault
@@ -45,7 +45,7 @@ class BlogFactoryImpl implements BlogFactory {
try {
BdfList blog = BdfList.of(clientHelper.toList(a), rssFeed);
byte[] descriptor = clientHelper.toByteArray(blog);
Group g = groupFactory.createGroup(CLIENT_ID, CLIENT_VERSION,
Group g = groupFactory.createGroup(CLIENT_ID, MAJOR_VERSION,
descriptor);
return new Blog(g, a, rssFeed);
} catch (FormatException e) {

2
briar-core/src/main/java/org/briarproject/briar/blog/BlogManagerImpl.java
View File

@@ -425,7 +425,7 @@ class BlogManagerImpl extends BdfIncomingMessageHook implements BlogManager,
Collection<Group> groups;
Transaction txn = db.startTransaction(true);
try {
groups = db.getGroups(txn, CLIENT_ID, CLIENT_VERSION);
groups = db.getGroups(txn, CLIENT_ID, MAJOR_VERSION);
for (Group g : groups) {
blogs.add(blogFactory.parseBlog(g));
}

6
briar-core/src/main/java/org/briarproject/briar/blog/BlogModule.java
View File

@@ -19,7 +19,7 @@ import dagger.Module;
import dagger.Provides;
import static org.briarproject.briar.api.blog.BlogManager.CLIENT_ID;
import static org.briarproject.briar.api.blog.BlogManager.CLIENT_VERSION;
import static org.briarproject.briar.api.blog.BlogManager.MAJOR_VERSION;
@Module
public class BlogModule {
@@ -38,7 +38,7 @@ public class BlogModule {
ValidationManager validationManager) {
lifecycleManager.registerClient(blogManager);
contactManager.registerContactHook(blogManager);
validationManager.registerIncomingMessageHook(CLIENT_ID, CLIENT_VERSION,
validationManager.registerIncomingMessageHook(CLIENT_ID, MAJOR_VERSION,
blogManager);
return blogManager;
}
@@ -64,7 +64,7 @@ public class BlogModule {
BlogPostValidator validator = new BlogPostValidator(groupFactory,
messageFactory, blogFactory, clientHelper, metadataEncoder,
clock);
validationManager.registerMessageValidator(CLIENT_ID, CLIENT_VERSION,
validationManager.registerMessageValidator(CLIENT_ID, MAJOR_VERSION,
validator);
return validator;
}

6
briar-core/src/main/java/org/briarproject/briar/blog/BlogPostValidator.java
View File

@@ -42,7 +42,7 @@ import static org.briarproject.briar.api.blog.BlogConstants.KEY_TYPE;
import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_COMMENT_LENGTH;
import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_BODY_LENGTH;
import static org.briarproject.briar.api.blog.BlogManager.CLIENT_ID;
import static org.briarproject.briar.api.blog.BlogManager.CLIENT_VERSION;
import static org.briarproject.briar.api.blog.BlogManager.MAJOR_VERSION;
import static org.briarproject.briar.api.blog.BlogPostFactory.SIGNING_LABEL_COMMENT;
import static org.briarproject.briar.api.blog.BlogPostFactory.SIGNING_LABEL_POST;
import static org.briarproject.briar.api.blog.MessageType.COMMENT;
@@ -195,7 +195,7 @@ class BlogPostValidator extends BdfMessageValidator {
checkLength(signature, 1, MAX_SIGNATURE_LENGTH);
// Get and Validate the Wrapped Message
Group wGroup = groupFactory.createGroup(CLIENT_ID, CLIENT_VERSION,
Group wGroup = groupFactory.createGroup(CLIENT_ID, MAJOR_VERSION,
descriptor);
Blog wBlog = blogFactory.parseBlog(wGroup);
BdfList wBodyList = BdfList.of(POST.getInt(), content, signature);
@@ -258,7 +258,7 @@ class BlogPostValidator extends BdfMessageValidator {
MessageId parentId = new MessageId(parentIdBytes);
// Get and Validate the Wrapped Comment
Group wGroup = groupFactory.createGroup(CLIENT_ID, CLIENT_VERSION,
Group wGroup = groupFactory.createGroup(CLIENT_ID, MAJOR_VERSION,
descriptor);
BdfList wBodyList = BdfList.of(COMMENT.getInt(), comment, pOriginalId,
oldId, signature);

2
briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java
View File

@@ -496,7 +496,7 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
}
private Group getLocalGroup() {
return contactGroupFactory.createLocalGroup(CLIENT_ID, CLIENT_VERSION);
return contactGroupFactory.createLocalGroup(CLIENT_ID, MAJOR_VERSION);
}
}

4
briar-core/src/main/java/org/briarproject/briar/forum/ForumFactoryImpl.java
View File

@@ -18,7 +18,7 @@ import javax.inject.Inject;
import static org.briarproject.briar.api.forum.ForumConstants.FORUM_SALT_LENGTH;
import static org.briarproject.briar.api.forum.ForumConstants.MAX_FORUM_NAME_LENGTH;
import static org.briarproject.briar.api.forum.ForumManager.CLIENT_ID;
import static org.briarproject.briar.api.forum.ForumManager.CLIENT_VERSION;
import static org.briarproject.briar.api.forum.ForumManager.MAJOR_VERSION;
@Immutable
@NotNullByDefault
@@ -52,7 +52,7 @@ class ForumFactoryImpl implements ForumFactory {
try {
BdfList forum = BdfList.of(name, salt);
byte[] descriptor = clientHelper.toByteArray(forum);
Group g = groupFactory.createGroup(CLIENT_ID, CLIENT_VERSION,
Group g = groupFactory.createGroup(CLIENT_ID, MAJOR_VERSION,
descriptor);
return new Forum(g, name, salt);
} catch (FormatException e) {

2
briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java
View File

@@ -188,7 +188,7 @@ class ForumManagerImpl extends BdfIncomingMessageHook implements ForumManager {
Collection<Group> groups;
Transaction txn = db.startTransaction(true);
try {
groups = db.getGroups(txn, CLIENT_ID, CLIENT_VERSION);
groups = db.getGroups(txn, CLIENT_ID, MAJOR_VERSION);
db.commitTransaction(txn);
} finally {
db.endTransaction(txn);

6
briar-core/src/main/java/org/briarproject/briar/forum/ForumModule.java
View File

@@ -15,7 +15,7 @@ import dagger.Module;
import dagger.Provides;
import static org.briarproject.briar.api.forum.ForumManager.CLIENT_ID;
import static org.briarproject.briar.api.forum.ForumManager.CLIENT_VERSION;
import static org.briarproject.briar.api.forum.ForumManager.MAJOR_VERSION;
@Module
public class ForumModule {
@@ -31,7 +31,7 @@ public class ForumModule {
@Singleton
ForumManager provideForumManager(ForumManagerImpl forumManager,
ValidationManager validationManager) {
validationManager.registerIncomingMessageHook(CLIENT_ID, CLIENT_VERSION,
validationManager.registerIncomingMessageHook(CLIENT_ID, MAJOR_VERSION,
forumManager);
return forumManager;
}
@@ -54,7 +54,7 @@ public class ForumModule {
MetadataEncoder metadataEncoder, Clock clock) {
ForumPostValidator validator = new ForumPostValidator(clientHelper,
metadataEncoder, clock);
validationManager.registerMessageValidator(CLIENT_ID, CLIENT_VERSION,
validationManager.registerMessageValidator(CLIENT_ID, MAJOR_VERSION,
validator);
return validator;
}

2
briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java
View File

@@ -127,7 +127,7 @@ class IntroductionManagerImpl extends ConversationClientImpl
db.addGroup(txn, g);
// Apply the client's visibility to the contact group
Visibility client = clientVersioningManager.getClientVisibility(txn,
c.getId(), CLIENT_ID, CLIENT_VERSION);
c.getId(), CLIENT_ID, MAJOR_VERSION);
if (LOG.isLoggable(INFO))
LOG.info("Applying visibility " + client + " to new contact group");db.setGroupVisibility(txn, c.getId(), g.getId(), client);
db.setGroupVisibility(txn, c.getId(), g.getId(), client);

10
briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionModule.java
View File

@@ -17,7 +17,7 @@ import dagger.Module;
import dagger.Provides;
import static org.briarproject.briar.api.introduction.IntroductionManager.CLIENT_ID;
import static org.briarproject.briar.api.introduction.IntroductionManager.CLIENT_VERSION;
import static org.briarproject.briar.api.introduction.IntroductionManager.MAJOR_VERSION;
@Module
public class IntroductionModule {
@@ -37,7 +37,7 @@ public class IntroductionModule {
IntroductionValidator introductionValidator =
new IntroductionValidator(messageEncoder, clientHelper,
metadataEncoder, clock);
validationManager.registerMessageValidator(CLIENT_ID, CLIENT_VERSION,
validationManager.registerMessageValidator(CLIENT_ID, MAJOR_VERSION,
introductionValidator);
return introductionValidator;
}
@@ -53,11 +53,11 @@ public class IntroductionModule {
lifecycleManager.registerClient(introductionManager);
contactManager.registerContactHook(introductionManager);
validationManager.registerIncomingMessageHook(CLIENT_ID,
CLIENT_VERSION, introductionManager);
MAJOR_VERSION, introductionManager);
conversationManager.registerConversationClient(introductionManager);
clientVersioningManager.registerClient(CLIENT_ID, CLIENT_VERSION);
clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION);
clientVersioningManager.registerClientVersioningHook(CLIENT_ID,
CLIENT_VERSION, introductionManager);
MAJOR_VERSION, introductionManager);
return introductionManager;
}

6
briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java
View File

@@ -65,7 +65,7 @@ class MessagingManagerImpl extends ConversationClientImpl
public void createLocalState(Transaction txn) throws DbException {
// Create a local group to indicate that we've set this client up
Group localGroup = contactGroupFactory.createLocalGroup(CLIENT_ID,
CLIENT_VERSION);
MAJOR_VERSION);
if (db.containsGroup(txn, localGroup.getId())) return;
db.addGroup(txn, localGroup);
// Set things up for any pre-existing contacts
@@ -80,7 +80,7 @@ class MessagingManagerImpl extends ConversationClientImpl
db.addGroup(txn, g);
// Apply the client's visibility to the contact group
Visibility client = clientVersioningManager.getClientVisibility(txn,
c.getId(), CLIENT_ID, CLIENT_VERSION);
c.getId(), CLIENT_ID, MAJOR_VERSION);
if (LOG.isLoggable(INFO))
LOG.info("Applying visibility " + client + " to new contact group");
db.setGroupVisibility(txn, c.getId(), g.getId(), client);
@@ -97,7 +97,7 @@ class MessagingManagerImpl extends ConversationClientImpl
@Override
public Group getContactGroup(Contact c) {
return contactGroupFactory.createContactGroup(CLIENT_ID,
CLIENT_VERSION, c);
MAJOR_VERSION, c);
}
@Override

10
briar-core/src/main/java/org/briarproject/briar/messaging/MessagingModule.java
View File

@@ -18,7 +18,7 @@ import dagger.Module;
import dagger.Provides;
import static org.briarproject.briar.api.messaging.MessagingManager.CLIENT_ID;
import static org.briarproject.briar.api.messaging.MessagingManager.CLIENT_VERSION;
import static org.briarproject.briar.api.messaging.MessagingManager.MAJOR_VERSION;
@Module
public class MessagingModule {
@@ -45,7 +45,7 @@ public class MessagingModule {
Clock clock) {
PrivateMessageValidator validator = new PrivateMessageValidator(
clientHelper, metadataEncoder, clock);
validationManager.registerMessageValidator(CLIENT_ID, CLIENT_VERSION,
validationManager.registerMessageValidator(CLIENT_ID, MAJOR_VERSION,
validator);
return validator;
}
@@ -59,12 +59,12 @@ public class MessagingModule {
MessagingManagerImpl messagingManager) {
lifecycleManager.registerClient(messagingManager);
contactManager.registerContactHook(messagingManager);
validationManager.registerIncomingMessageHook(CLIENT_ID, CLIENT_VERSION,
validationManager.registerIncomingMessageHook(CLIENT_ID, MAJOR_VERSION,
messagingManager);
conversationManager.registerConversationClient(messagingManager);
clientVersioningManager.registerClient(CLIENT_ID, CLIENT_VERSION);
clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION);
clientVersioningManager.registerClientVersioningHook(CLIENT_ID,
CLIENT_VERSION, messagingManager);
MAJOR_VERSION, messagingManager);
return messagingManager;
}

4
briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupFactoryImpl.java
View File

@@ -21,7 +21,7 @@ import static org.briarproject.bramble.util.ValidationUtils.checkSize;
import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.GROUP_SALT_LENGTH;
import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_NAME_LENGTH;
import static org.briarproject.briar.api.privategroup.PrivateGroupManager.CLIENT_ID;
import static org.briarproject.briar.api.privategroup.PrivateGroupManager.CLIENT_VERSION;
import static org.briarproject.briar.api.privategroup.PrivateGroupManager.MAJOR_VERSION;
@Immutable
@NotNullByDefault
@@ -57,7 +57,7 @@ class PrivateGroupFactoryImpl implements PrivateGroupFactory {
BdfList creatorList = clientHelper.toList(creator);
BdfList group = BdfList.of(creatorList, name, salt);
byte[] descriptor = clientHelper.toByteArray(group);
Group g = groupFactory.createGroup(CLIENT_ID, CLIENT_VERSION,
Group g = groupFactory.createGroup(CLIENT_ID, MAJOR_VERSION,
descriptor);
return new PrivateGroup(g, name, creator, salt);
} catch (FormatException e) {

2
briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java
View File

@@ -271,7 +271,7 @@ class PrivateGroupManagerImpl extends BdfIncomingMessageHook
Collection<Group> groups;
Transaction txn = db.startTransaction(true);
try {
groups = db.getGroups(txn, CLIENT_ID, CLIENT_VERSION);
groups = db.getGroups(txn, CLIENT_ID, MAJOR_VERSION);
db.commitTransaction(txn);
} finally {
db.endTransaction(txn);

6
briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupModule.java
View File

@@ -16,7 +16,7 @@ import dagger.Module;
import dagger.Provides;
import static org.briarproject.briar.api.privategroup.PrivateGroupManager.CLIENT_ID;
import static org.briarproject.briar.api.privategroup.PrivateGroupManager.CLIENT_VERSION;
import static org.briarproject.briar.api.privategroup.PrivateGroupManager.MAJOR_VERSION;
@Module
public class PrivateGroupModule {
@@ -33,7 +33,7 @@ public class PrivateGroupModule {
PrivateGroupManager provideGroupManager(
PrivateGroupManagerImpl groupManager,
ValidationManager validationManager) {
validationManager.registerIncomingMessageHook(CLIENT_ID, CLIENT_VERSION,
validationManager.registerIncomingMessageHook(CLIENT_ID, MAJOR_VERSION,
groupManager);
return groupManager;
}
@@ -60,7 +60,7 @@ public class PrivateGroupModule {
GroupMessageValidator validator = new GroupMessageValidator(
privateGroupFactory, clientHelper, metadataEncoder, clock,
groupInvitationFactory);
validationManager.registerMessageValidator(CLIENT_ID, CLIENT_VERSION,
validationManager.registerMessageValidator(CLIENT_ID, MAJOR_VERSION,
validator);
return validator;
}

4
briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngine.java
View File

@@ -30,7 +30,7 @@ import javax.annotation.Nullable;
import javax.annotation.concurrent.Immutable;
import static org.briarproject.briar.api.privategroup.PrivateGroupManager.CLIENT_ID;
import static org.briarproject.briar.api.privategroup.PrivateGroupManager.CLIENT_VERSION;
import static org.briarproject.briar.api.privategroup.PrivateGroupManager.MAJOR_VERSION;
import static org.briarproject.briar.privategroup.invitation.GroupInvitationConstants.GROUP_KEY_CONTACT_ID;
import static org.briarproject.briar.privategroup.invitation.MessageType.ABORT;
import static org.briarproject.briar.privategroup.invitation.MessageType.INVITE;
@@ -101,7 +101,7 @@ abstract class AbstractProtocolEngine<S extends Session>
// Apply min of preferred visibility and client's visibility
ContactId contactId = getContactId(txn, session.getContactGroupId());
Visibility client = clientVersioningManager.getClientVisibility(txn,
contactId, CLIENT_ID, CLIENT_VERSION);
contactId, CLIENT_ID, MAJOR_VERSION);
Visibility min = Visibility.min(preferred, client);
db.setGroupVisibility(txn, contactId, session.getPrivateGroupId(), min);
}

4
briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationFactoryImpl.java
View File

@@ -17,7 +17,7 @@ import javax.annotation.concurrent.Immutable;
import javax.inject.Inject;
import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.CLIENT_ID;
import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.CLIENT_VERSION;
import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.MAJOR_VERSION;
@Immutable
@NotNullByDefault
@@ -53,7 +53,7 @@ class GroupInvitationFactoryImpl implements GroupInvitationFactory {
public BdfList createInviteToken(AuthorId creatorId, AuthorId memberId,
GroupId privateGroupId, long timestamp) {
Group contactGroup = contactGroupFactory.createContactGroup(CLIENT_ID,
CLIENT_VERSION, creatorId, memberId);
MAJOR_VERSION, creatorId, memberId);
return BdfList.of(
timestamp,
contactGroup.getId(),

10
briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java
View File

@@ -108,7 +108,7 @@ class GroupInvitationManagerImpl extends ConversationClientImpl
public void createLocalState(Transaction txn) throws DbException {
// Create a local group to indicate that we've set this client up
Group localGroup = contactGroupFactory.createLocalGroup(CLIENT_ID,
CLIENT_VERSION);
MAJOR_VERSION);
if (db.containsGroup(txn, localGroup.getId())) return;
db.addGroup(txn, localGroup);
// Set things up for any pre-existing contacts
@@ -122,7 +122,7 @@ class GroupInvitationManagerImpl extends ConversationClientImpl
// Store the group and share it with the contact
db.addGroup(txn, g);
Visibility client = clientVersioningManager.getClientVisibility(txn,
c.getId(), CLIENT_ID, CLIENT_VERSION);
c.getId(), CLIENT_ID, MAJOR_VERSION);
if (LOG.isLoggable(INFO))
LOG.info("Applying visibility " + client + " to new contact group");
db.setGroupVisibility(txn, c.getId(), g.getId(), client);
@@ -136,7 +136,7 @@ class GroupInvitationManagerImpl extends ConversationClientImpl
}
// If the contact belongs to any private groups, create a peer session
for (Group pg : db.getGroups(txn, PrivateGroupManager.CLIENT_ID,
PrivateGroupManager.CLIENT_VERSION)) {
PrivateGroupManager.MAJOR_VERSION)) {
if (privateGroupManager.isMember(txn, pg.getId(), c.getAuthor()))
addingMember(txn, pg.getId(), c);
}
@@ -151,7 +151,7 @@ class GroupInvitationManagerImpl extends ConversationClientImpl
@Override
public Group getContactGroup(Contact c) {
return contactGroupFactory.createContactGroup(CLIENT_ID,
CLIENT_VERSION, c);
MAJOR_VERSION, c);
}
@Override
@@ -599,7 +599,7 @@ class GroupInvitationManagerImpl extends ConversationClientImpl
try {
Collection<Group> shareables =
db.getGroups(txn, PrivateGroupManager.CLIENT_ID,
PrivateGroupManager.CLIENT_VERSION);
PrivateGroupManager.MAJOR_VERSION);
Map<GroupId, Visibility> m = getPreferredVisibilities(txn, c);
for (Group g : shareables) {
Visibility preferred = m.get(g.getId());

14
briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationModule.java
View File

@@ -20,7 +20,7 @@ import dagger.Module;
import dagger.Provides;
import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.CLIENT_ID;
import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.CLIENT_VERSION;
import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.MAJOR_VERSION;
@Module
public class GroupInvitationModule {
@@ -42,21 +42,21 @@ public class GroupInvitationModule {
ConversationManager conversationManager,
ClientVersioningManager clientVersioningManager) {
lifecycleManager.registerClient(groupInvitationManager);
validationManager.registerIncomingMessageHook(CLIENT_ID, CLIENT_VERSION,
validationManager.registerIncomingMessageHook(CLIENT_ID, MAJOR_VERSION,
groupInvitationManager);
contactManager.registerContactHook(groupInvitationManager);
privateGroupManager.registerPrivateGroupHook(groupInvitationManager);
conversationManager.registerConversationClient(groupInvitationManager);
clientVersioningManager.registerClient(CLIENT_ID, CLIENT_VERSION);
clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION);
clientVersioningManager.registerClientVersioningHook(CLIENT_ID,
CLIENT_VERSION, groupInvitationManager);
MAJOR_VERSION, groupInvitationManager);
// The group invitation manager handles client visibility changes for
// the private group manager
clientVersioningManager.registerClient(PrivateGroupManager.CLIENT_ID,
PrivateGroupManager.CLIENT_VERSION);
PrivateGroupManager.MAJOR_VERSION);
clientVersioningManager.registerClientVersioningHook(
PrivateGroupManager.CLIENT_ID,
PrivateGroupManager.CLIENT_VERSION,
PrivateGroupManager.MAJOR_VERSION,
groupInvitationManager.getPrivateGroupClientVersioningHook());
return groupInvitationManager;
}
@@ -71,7 +71,7 @@ public class GroupInvitationModule {
GroupInvitationValidator validator = new GroupInvitationValidator(
clientHelper, metadataEncoder, clock, privateGroupFactory,
messageEncoder);
validationManager.registerMessageValidator(CLIENT_ID, CLIENT_VERSION,
validationManager.registerMessageValidator(CLIENT_ID, MAJOR_VERSION,
validator);
return validator;
}

4
briar-core/src/main/java/org/briarproject/briar/sharing/BlogProtocolEngineImpl.java
View File

@@ -24,7 +24,7 @@ import javax.annotation.concurrent.Immutable;
import javax.inject.Inject;
import static org.briarproject.briar.api.blog.BlogManager.CLIENT_ID;
import static org.briarproject.briar.api.blog.BlogManager.CLIENT_VERSION;
import static org.briarproject.briar.api.blog.BlogManager.MAJOR_VERSION;
@Immutable
@NotNullByDefault
@@ -42,7 +42,7 @@ class BlogProtocolEngineImpl extends ProtocolEngineImpl<Blog> {
InvitationFactory<Blog, BlogInvitationResponse> invitationFactory) {
super(db, clientHelper, clientVersioningManager, messageEncoder,
messageParser, messageTracker, clock, CLIENT_ID,
CLIENT_VERSION);
MAJOR_VERSION);
this.blogManager = blogManager;
this.invitationFactory = invitationFactory;
}

4
briar-core/src/main/java/org/briarproject/briar/sharing/BlogSharingManagerImpl.java
View File

@@ -55,7 +55,7 @@ class BlogSharingManagerImpl extends SharingManagerImpl<Blog>
@Override
protected int getClientVersion() {
return CLIENT_VERSION;
return MAJOR_VERSION;
}
@Override
@@ -65,7 +65,7 @@ class BlogSharingManagerImpl extends SharingManagerImpl<Blog>
@Override
protected int getShareableClientVersion() {
return BlogManager.CLIENT_VERSION;
return BlogManager.MAJOR_VERSION;
}
@Override

4
briar-core/src/main/java/org/briarproject/briar/sharing/ForumProtocolEngineImpl.java
View File

@@ -24,7 +24,7 @@ import javax.annotation.concurrent.Immutable;
import javax.inject.Inject;
import static org.briarproject.briar.api.forum.ForumManager.CLIENT_ID;
import static org.briarproject.briar.api.forum.ForumManager.CLIENT_VERSION;
import static org.briarproject.briar.api.forum.ForumManager.MAJOR_VERSION;
@Immutable
@NotNullByDefault
@@ -44,7 +44,7 @@ class ForumProtocolEngineImpl extends ProtocolEngineImpl<Forum> {
InvitationFactory<Forum, ForumInvitationResponse> invitationFactory) {
super(db, clientHelper, clientVersioningManager, messageEncoder,
messageParser, messageTracker, clock, CLIENT_ID,
CLIENT_VERSION);
MAJOR_VERSION);
this.forumManager = forumManager;
this.invitationFactory = invitationFactory;
}

4
briar-core/src/main/java/org/briarproject/briar/sharing/ForumSharingManagerImpl.java
View File

@@ -43,7 +43,7 @@ class ForumSharingManagerImpl extends SharingManagerImpl<Forum>
@Override
protected int getClientVersion() {
return CLIENT_VERSION;
return MAJOR_VERSION;
}
@Override
@@ -53,7 +53,7 @@ class ForumSharingManagerImpl extends SharingManagerImpl<Forum>
@Override
protected int getShareableClientVersion() {
return ForumManager.CLIENT_VERSION;
return ForumManager.MAJOR_VERSION;
}
@Override

24
briar-core/src/main/java/org/briarproject/briar/sharing/SharingModule.java
View File

@@ -64,7 +64,7 @@ public class SharingModule {
messageEncoder, clientHelper, metadataEncoder, clock,
blogFactory);
validationManager.registerMessageValidator(BlogSharingManager.CLIENT_ID,
BlogSharingManager.CLIENT_VERSION, validator);
BlogSharingManager.MAJOR_VERSION, validator);
return validator;
}
@@ -79,21 +79,21 @@ public class SharingModule {
lifecycleManager.registerClient(blogSharingManager);
contactManager.registerContactHook(blogSharingManager);
validationManager.registerIncomingMessageHook(
BlogSharingManager.CLIENT_ID, BlogSharingManager.CLIENT_VERSION,
BlogSharingManager.CLIENT_ID, BlogSharingManager.MAJOR_VERSION,
blogSharingManager);
conversationManager.registerConversationClient(blogSharingManager);
blogManager.registerRemoveBlogHook(blogSharingManager);
clientVersioningManager.registerClient(BlogSharingManager.CLIENT_ID,
BlogSharingManager.CLIENT_VERSION);
BlogSharingManager.MAJOR_VERSION);
clientVersioningManager.registerClientVersioningHook(
BlogSharingManager.CLIENT_ID, BlogSharingManager.CLIENT_VERSION,
BlogSharingManager.CLIENT_ID, BlogSharingManager.MAJOR_VERSION,
blogSharingManager);
// The blog sharing manager handles client visibility changes for the
// blog manager
clientVersioningManager.registerClient(BlogManager.CLIENT_ID,
BlogManager.CLIENT_VERSION);
BlogManager.MAJOR_VERSION);
clientVersioningManager.registerClientVersioningHook(
BlogManager.CLIENT_ID, BlogManager.CLIENT_VERSION,
BlogManager.CLIENT_ID, BlogManager.MAJOR_VERSION,
blogSharingManager.getShareableClientVersioningHook());
return blogSharingManager;
}
@@ -127,7 +127,7 @@ public class SharingModule {
forumFactory);
validationManager.registerMessageValidator(
ForumSharingManager.CLIENT_ID,
ForumSharingManager.CLIENT_VERSION, validator);
ForumSharingManager.MAJOR_VERSION, validator);
return validator;
}
@@ -143,20 +143,20 @@ public class SharingModule {
contactManager.registerContactHook(forumSharingManager);
validationManager.registerIncomingMessageHook(
ForumSharingManager.CLIENT_ID,
ForumSharingManager.CLIENT_VERSION, forumSharingManager);
ForumSharingManager.MAJOR_VERSION, forumSharingManager);
conversationManager.registerConversationClient(forumSharingManager);
forumManager.registerRemoveForumHook(forumSharingManager);
clientVersioningManager.registerClient(ForumSharingManager.CLIENT_ID,
ForumSharingManager.CLIENT_VERSION);
ForumSharingManager.MAJOR_VERSION);
clientVersioningManager.registerClientVersioningHook(
ForumSharingManager.CLIENT_ID,
ForumSharingManager.CLIENT_VERSION, forumSharingManager);
ForumSharingManager.MAJOR_VERSION, forumSharingManager);
// The forum sharing manager handles client visibility changes for the
// forum manager
clientVersioningManager.registerClient(ForumManager.CLIENT_ID,
ForumManager.CLIENT_VERSION);
ForumManager.MAJOR_VERSION);
clientVersioningManager.registerClientVersioningHook(
ForumManager.CLIENT_ID, ForumManager.CLIENT_VERSION,
ForumManager.CLIENT_ID, ForumManager.MAJOR_VERSION,
forumSharingManager.getShareableClientVersioningHook());
return forumSharingManager;
}

4
briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java
View File

@@ -50,7 +50,7 @@ import static org.briarproject.briar.api.blog.BlogConstants.KEY_TIME_RECEIVED;
import static org.briarproject.briar.api.blog.BlogConstants.KEY_TYPE;
import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_COMMENT_LENGTH;
import static org.briarproject.briar.api.blog.BlogManager.CLIENT_ID;
import static org.briarproject.briar.api.blog.BlogManager.CLIENT_VERSION;
import static org.briarproject.briar.api.blog.BlogManager.MAJOR_VERSION;
import static org.briarproject.briar.api.blog.MessageType.COMMENT;
import static org.briarproject.briar.api.blog.MessageType.POST;
import static org.briarproject.briar.api.blog.MessageType.WRAPPED_COMMENT;
@@ -868,7 +868,7 @@ public class BlogManagerImplTest extends BriarTestCase {
}
private Blog createBlog(LocalAuthor localAuthor, boolean rssFeed) {
Group group = getGroup(CLIENT_ID, CLIENT_VERSION);
Group group = getGroup(CLIENT_ID, MAJOR_VERSION);
return new Blog(group, localAuthor, rssFeed);
}

8
briar-core/src/test/java/org/briarproject/briar/blog/BlogPostValidatorTest.java
View File

@@ -36,7 +36,7 @@ import static org.briarproject.briar.api.blog.BlogConstants.KEY_PARENT_MSG_ID;
import static org.briarproject.briar.api.blog.BlogConstants.KEY_READ;
import static org.briarproject.briar.api.blog.BlogConstants.KEY_RSS_FEED;
import static org.briarproject.briar.api.blog.BlogManager.CLIENT_ID;
import static org.briarproject.briar.api.blog.BlogManager.CLIENT_VERSION;
import static org.briarproject.briar.api.blog.BlogManager.MAJOR_VERSION;
import static org.briarproject.briar.api.blog.BlogPostFactory.SIGNING_LABEL_COMMENT;
import static org.briarproject.briar.api.blog.BlogPostFactory.SIGNING_LABEL_POST;
import static org.briarproject.briar.api.blog.MessageType.COMMENT;
@@ -64,7 +64,7 @@ public class BlogPostValidatorTest extends BriarTestCase {
private final String body = getRandomString(42);
public BlogPostValidatorTest() {
group = getGroup(CLIENT_ID, CLIENT_VERSION);
group = getGroup(CLIENT_ID, MAJOR_VERSION);
descriptor = group.getDescriptor();
author = getAuthor();
authorList = BdfList.of(
@@ -206,7 +206,7 @@ public class BlogPostValidatorTest extends BriarTestCase {
byte[] originalBody = getRandomBytes(42);
context.checking(new Expectations() {{
oneOf(groupFactory).createGroup(CLIENT_ID, CLIENT_VERSION,
oneOf(groupFactory).createGroup(CLIENT_ID, MAJOR_VERSION,
descriptor);
will(returnValue(b.getGroup()));
oneOf(blogFactory).parseBlog(b.getGroup());
@@ -250,7 +250,7 @@ public class BlogPostValidatorTest extends BriarTestCase {
byte[] originalBody = getRandomBytes(42);
context.checking(new Expectations() {{
oneOf(groupFactory).createGroup(CLIENT_ID, CLIENT_VERSION,
oneOf(groupFactory).createGroup(CLIENT_ID, MAJOR_VERSION,
descriptor);
will(returnValue(blog.getGroup()));
oneOf(clientHelper).toByteArray(originalList);

8
briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerImplTest.java
View File

@@ -43,7 +43,7 @@ import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
import static org.briarproject.bramble.test.TestUtils.getRandomId;
import static org.briarproject.briar.api.feed.FeedConstants.KEY_FEEDS;
import static org.briarproject.briar.api.feed.FeedManager.CLIENT_ID;
import static org.briarproject.briar.api.feed.FeedManager.CLIENT_VERSION;
import static org.briarproject.briar.api.feed.FeedManager.MAJOR_VERSION;
public class FeedManagerImplTest extends BrambleMockTestCase {
@@ -61,10 +61,10 @@ public class FeedManagerImplTest extends BrambleMockTestCase {
private final Clock clock = context.mock(Clock.class);
private final Dns noDnsLookups = context.mock(Dns.class);
private final Group localGroup = getGroup(CLIENT_ID, CLIENT_VERSION);
private final Group localGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
private final GroupId localGroupId = localGroup.getId();
private final Group blogGroup =
getGroup(BlogManager.CLIENT_ID, BlogManager.CLIENT_VERSION);
getGroup(BlogManager.CLIENT_ID, BlogManager.MAJOR_VERSION);
private final GroupId blogGroupId = blogGroup.getId();
private final LocalAuthor localAuthor = getLocalAuthor();
private final Blog blog = new Blog(blogGroup, localAuthor, true);
@@ -132,7 +132,7 @@ public class FeedManagerImplTest extends BrambleMockTestCase {
private void expectGetLocalGroup() {
context.checking(new Expectations() {{
oneOf(contactGroupFactory).createLocalGroup(CLIENT_ID,
CLIENT_VERSION);
MAJOR_VERSION);
will(returnValue(localGroup));
}});
}

4
briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java
View File

@@ -47,7 +47,7 @@ import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
import static org.briarproject.bramble.test.TestUtils.getTransportProperties;
import static org.briarproject.bramble.test.TestUtils.getTransportPropertiesMap;
import static org.briarproject.briar.api.introduction.IntroductionManager.CLIENT_ID;
import static org.briarproject.briar.api.introduction.IntroductionManager.CLIENT_VERSION;
import static org.briarproject.briar.api.introduction.IntroductionManager.MAJOR_VERSION;
import static org.briarproject.briar.introduction.IntroduceeState.AWAIT_RESPONSES;
import static org.briarproject.briar.introduction.IntroduceeState.LOCAL_DECLINED;
import static org.briarproject.briar.introduction.IntroducerState.A_DECLINED;
@@ -1284,7 +1284,7 @@ public class IntroductionIntegrationTest
}
private Group getLocalGroup() {
return contactGroupFactory.createLocalGroup(CLIENT_ID, CLIENT_VERSION);
return contactGroupFactory.createLocalGroup(CLIENT_ID, MAJOR_VERSION);
}
}

6
briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/AbstractProtocolEngineTest.java
View File

@@ -36,7 +36,7 @@ import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.GROU
import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_INVITATION_MSG_LENGTH;
import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_NAME_LENGTH;
import static org.briarproject.briar.api.privategroup.PrivateGroupManager.CLIENT_ID;
import static org.briarproject.briar.api.privategroup.PrivateGroupManager.CLIENT_VERSION;
import static org.briarproject.briar.api.privategroup.PrivateGroupManager.MAJOR_VERSION;
import static org.briarproject.briar.privategroup.invitation.GroupInvitationConstants.GROUP_KEY_CONTACT_ID;
import static org.briarproject.briar.privategroup.invitation.MessageType.ABORT;
import static org.briarproject.briar.privategroup.invitation.MessageType.INVITE;
@@ -71,7 +71,7 @@ public abstract class AbstractProtocolEngineTest extends BrambleMockTestCase {
protected final Transaction txn = new Transaction(null, false);
protected final GroupId contactGroupId = new GroupId(getRandomId());
protected final Group privateGroupGroup =
getGroup(CLIENT_ID, CLIENT_VERSION);
getGroup(CLIENT_ID, MAJOR_VERSION);
protected final GroupId privateGroupId = privateGroupGroup.getId();
protected final Author author = getAuthor();
protected final PrivateGroup privateGroup =
@@ -191,7 +191,7 @@ public abstract class AbstractProtocolEngineTest extends BrambleMockTestCase {
expectGetContactId();
context.checking(new Expectations() {{
oneOf(clientVersioningManager).getClientVisibility(txn, contactId,
CLIENT_ID, CLIENT_VERSION);
CLIENT_ID, MAJOR_VERSION);
will(returnValue(SHARED));
oneOf(db).setGroupVisibility(txn, contactId, privateGroupId, v);
}});

50
briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java
View File

@@ -56,7 +56,7 @@ import static org.briarproject.bramble.util.StringUtils.getRandomString;
import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.GROUP_SALT_LENGTH;
import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_NAME_LENGTH;
import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.CLIENT_ID;
import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.CLIENT_VERSION;
import static org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager.MAJOR_VERSION;
import static org.briarproject.briar.privategroup.invitation.GroupInvitationConstants.GROUP_KEY_CONTACT_ID;
import static org.briarproject.briar.privategroup.invitation.MessageType.ABORT;
import static org.briarproject.briar.privategroup.invitation.MessageType.INVITE;
@@ -102,9 +102,9 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
private final Author author = getAuthor();
private final Contact contact = new Contact(contactId, author,
new AuthorId(getRandomId()), true, true);
private final Group localGroup = getGroup(CLIENT_ID, CLIENT_VERSION);
private final Group contactGroup = getGroup(CLIENT_ID, CLIENT_VERSION);
private final Group privateGroup = getGroup(CLIENT_ID, CLIENT_VERSION);
private final Group localGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
private final Group contactGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
private final Group privateGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
private final BdfDictionary meta = BdfDictionary.of(new BdfEntry("m", "e"));
private final Message message =
new Message(new MessageId(getRandomId()), contactGroup.getId(),
@@ -154,7 +154,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
public void testCreateLocalStateFirstTime() throws Exception {
context.checking(new Expectations() {{
oneOf(contactGroupFactory).createLocalGroup(CLIENT_ID,
CLIENT_VERSION);
MAJOR_VERSION);
will(returnValue(localGroup));
oneOf(db).containsGroup(txn, localGroup.getId());
will(returnValue(false));
@@ -170,7 +170,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
public void testCreateLocalStateSubsequentTime() throws Exception {
context.checking(new Expectations() {{
oneOf(contactGroupFactory).createLocalGroup(CLIENT_ID,
CLIENT_VERSION);
MAJOR_VERSION);
will(returnValue(localGroup));
oneOf(db).containsGroup(txn, localGroup.getId());
will(returnValue(true));
@@ -184,18 +184,18 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
context.checking(new Expectations() {{
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, c);
MAJOR_VERSION, c);
will(returnValue(contactGroup));
oneOf(db).addGroup(txn, contactGroup);
oneOf(clientVersioningManager).getClientVisibility(txn, contactId,
CLIENT_ID, CLIENT_VERSION);
CLIENT_ID, MAJOR_VERSION);
will(returnValue(SHARED));
oneOf(db).setGroupVisibility(txn, c.getId(), contactGroup.getId(),
SHARED);
oneOf(clientHelper)
.mergeGroupMetadata(txn, contactGroup.getId(), meta);
oneOf(db).getGroups(txn, PrivateGroupManager.CLIENT_ID,
PrivateGroupManager.CLIENT_VERSION);
PrivateGroupManager.MAJOR_VERSION);
will(returnValue(Collections.singletonList(privateGroup)));
oneOf(privateGroupManager).isMember(txn, privateGroup.getId(),
c.getAuthor());
@@ -207,7 +207,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
private void expectAddingMember(GroupId g, Contact c) throws Exception {
context.checking(new Expectations() {{
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, c);
MAJOR_VERSION, c);
will(returnValue(contactGroup));
}});
expectGetSession(noResults, new SessionId(g.getBytes()),
@@ -263,7 +263,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
public void testRemovingContact() throws Exception {
context.checking(new Expectations() {{
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(db).removeGroup(txn, contactGroup);
}});
@@ -478,7 +478,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
oneOf(db).getContact(txn, contactId);
will(returnValue(contact));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
}});
expectCreateStorageId();
@@ -510,7 +510,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
oneOf(db).getContact(txn, contactId);
will(returnValue(contact));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(sessionParser)
.parseCreatorSession(contactGroup.getId(), bdfSession);
@@ -539,7 +539,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
oneOf(db).getContact(txn, contactId);
will(returnValue(contact));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(db).endTransaction(txn);
}});
@@ -591,7 +591,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
oneOf(db).getContact(txn, contactId);
will(returnValue(contact));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(sessionParser)
.parseInviteeSession(contactGroup.getId(), bdfSession);
@@ -613,7 +613,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
oneOf(db).getContact(txn, contactId);
will(returnValue(contact));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(sessionParser)
.parsePeerSession(contactGroup.getId(), bdfSession);
@@ -638,7 +638,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
oneOf(db).getContact(txn, contactId);
will(returnValue(contact));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(db).endTransaction(txn);
}});
@@ -677,7 +677,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
oneOf(db).getContact(txn, contactId);
will(returnValue(contact));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(messageParser).getMessagesVisibleInUiQuery();
will(returnValue(query));
@@ -754,7 +754,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
oneOf(db).getContacts(txn);
will(returnValue(Collections.singletonList(contact)));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
contactGroup.getId(), query);
@@ -822,7 +822,7 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
expectGetSession(oneResult, sessionId, contactGroup.getId());
context.checking(new Expectations() {{
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(db).startTransaction(true);
will(returnValue(txn));
@@ -855,8 +855,8 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
Collection<Contact> contacts =
Arrays.asList(contact, contact2, contact3);
Group contactGroup2 = getGroup(CLIENT_ID, CLIENT_VERSION);
Group contactGroup3 = getGroup(CLIENT_ID, CLIENT_VERSION);
Group contactGroup2 = getGroup(CLIENT_ID, MAJOR_VERSION);
Group contactGroup3 = getGroup(CLIENT_ID, MAJOR_VERSION);
MessageId storageId2 = new MessageId(getRandomId());
MessageId storageId3 = new MessageId(getRandomId());
@@ -875,13 +875,13 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
oneOf(db).getContacts(txn);
will(returnValue(contacts));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact2);
MAJOR_VERSION, contact2);
will(returnValue(contactGroup2));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact3);
MAJOR_VERSION, contact3);
will(returnValue(contactGroup3));
// session 1
oneOf(sessionParser).getRole(bdfSession);

6
briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java
View File

@@ -32,7 +32,7 @@ import java.util.Collection;
import java.util.List;
import static org.briarproject.briar.api.blog.BlogSharingManager.CLIENT_ID;
import static org.briarproject.briar.api.blog.BlogSharingManager.CLIENT_VERSION;
import static org.briarproject.briar.api.blog.BlogSharingManager.MAJOR_VERSION;
import static org.briarproject.briar.test.BriarTestUtils.assertGroupCount;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -126,7 +126,7 @@ public class BlogSharingIntegrationTest
// get sharing group and assert group message count
GroupId g = contactGroupFactory.createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact1From0).getId();
MAJOR_VERSION, contact1From0).getId();
assertGroupCount(messageTracker0, g, 1, 0);
// sync first request message
@@ -201,7 +201,7 @@ public class BlogSharingIntegrationTest
// get sharing group and assert group message count
GroupId g = contactGroupFactory.createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact1From0).getId();
MAJOR_VERSION, contact1From0).getId();
assertGroupCount(messageTracker0, g, 1, 0);
// sync first request message

26
briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingManagerImplTest.java
View File

@@ -39,7 +39,7 @@ import static org.briarproject.bramble.test.TestUtils.getLocalAuthor;
import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
import static org.briarproject.bramble.test.TestUtils.getRandomId;
import static org.briarproject.briar.api.blog.BlogSharingManager.CLIENT_ID;
import static org.briarproject.briar.api.blog.BlogSharingManager.CLIENT_VERSION;
import static org.briarproject.briar.api.blog.BlogSharingManager.MAJOR_VERSION;
import static org.briarproject.briar.sharing.SharingConstants.GROUP_KEY_CONTACT_ID;
public class BlogSharingManagerImplTest extends BrambleMockTestCase {
@@ -66,13 +66,13 @@ public class BlogSharingManagerImplTest extends BrambleMockTestCase {
new Contact(contactId, author, localAuthor.getId(), true, true);
private final Collection<Contact> contacts =
Collections.singletonList(contact);
private final Group localGroup = getGroup(CLIENT_ID, CLIENT_VERSION);
private final Group contactGroup = getGroup(CLIENT_ID, CLIENT_VERSION);
private final Group localGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
private final Group contactGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
private final Group blogGroup =
getGroup(BlogManager.CLIENT_ID, BlogManager.CLIENT_VERSION);
getGroup(BlogManager.CLIENT_ID, BlogManager.MAJOR_VERSION);
private final Blog blog = new Blog(blogGroup, author, false);
private final Group localBlogGroup =
getGroup(BlogManager.CLIENT_ID, BlogManager.CLIENT_VERSION);
getGroup(BlogManager.CLIENT_ID, BlogManager.MAJOR_VERSION);
private final Blog localBlog = new Blog(localBlogGroup, localAuthor, false);
@SuppressWarnings("unchecked")
private final ProtocolEngine<Blog> engine =
@@ -100,7 +100,7 @@ public class BlogSharingManagerImplTest extends BrambleMockTestCase {
context.checking(new Expectations() {{
// The local group doesn't exist - we need to set things up
oneOf(contactGroupFactory).createLocalGroup(CLIENT_ID,
CLIENT_VERSION);
MAJOR_VERSION);
will(returnValue(localGroup));
oneOf(db).containsGroup(txn, localGroup.getId());
will(returnValue(false));
@@ -123,11 +123,11 @@ public class BlogSharingManagerImplTest extends BrambleMockTestCase {
context.checking(new Expectations() {{
// Create the contact group and share it with the contact
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(db).addGroup(txn, contactGroup);
oneOf(clientVersioningManager).getClientVisibility(txn, contactId,
CLIENT_ID, CLIENT_VERSION);
CLIENT_ID, MAJOR_VERSION);
will(returnValue(SHARED));
oneOf(db).setGroupVisibility(txn, contactId, contactGroup.getId(),
SHARED);
@@ -154,7 +154,7 @@ public class BlogSharingManagerImplTest extends BrambleMockTestCase {
context.checking(new Expectations() {{
// The local group exists - everything has been set up
oneOf(contactGroupFactory).createLocalGroup(CLIENT_ID,
CLIENT_VERSION);
MAJOR_VERSION);
will(returnValue(localGroup));
oneOf(db).containsGroup(txn, localGroup.getId());
will(returnValue(true));
@@ -196,13 +196,13 @@ public class BlogSharingManagerImplTest extends BrambleMockTestCase {
private void expectPreShareShareable(Transaction txn, Contact contact,
Blog blog, Map<MessageId, BdfDictionary> sessions)
throws Exception {
Group contactGroup = getGroup(CLIENT_ID, CLIENT_VERSION);
Group contactGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
BdfDictionary sessionDict = new BdfDictionary();
Message message = new Message(new MessageId(getRandomId()),
contactGroup.getId(), 42L, getRandomBytes(1337));
context.checking(new Expectations() {{
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(sessionParser)
.getSessionQuery(new SessionId(blog.getId().getBytes()));
@@ -214,7 +214,7 @@ public class BlogSharingManagerImplTest extends BrambleMockTestCase {
oneOf(db).addGroup(txn, blog.getGroup());
oneOf(clientVersioningManager).getClientVisibility(txn,
contactId, BlogManager.CLIENT_ID,
BlogManager.CLIENT_VERSION);
BlogManager.MAJOR_VERSION);
will(returnValue(SHARED));
oneOf(db).setGroupVisibility(txn, contact.getId(),
blog.getGroup().getId(), SHARED);
@@ -240,7 +240,7 @@ public class BlogSharingManagerImplTest extends BrambleMockTestCase {
oneOf(db).getContacts(txn);
will(returnValue(contacts));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact);
MAJOR_VERSION, contact);
will(returnValue(contactGroup));
oneOf(sessionParser)
.getSessionQuery(new SessionId(blog.getId().getBytes()));

6
briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java
View File

@@ -39,7 +39,7 @@ import java.util.List;
import static junit.framework.Assert.assertNotNull;
import static org.briarproject.bramble.util.StringUtils.getRandomString;
import static org.briarproject.briar.api.forum.ForumSharingManager.CLIENT_ID;
import static org.briarproject.briar.api.forum.ForumSharingManager.CLIENT_VERSION;
import static org.briarproject.briar.api.forum.ForumSharingManager.MAJOR_VERSION;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -402,7 +402,7 @@ public class ForumSharingIntegrationTest
// response and invitation got tracked
Group group = contactGroupFactory.createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact0From1);
MAJOR_VERSION, contact0From1);
assertEquals(2, c1.getMessageTracker().getGroupCount(group.getId())
.getMsgCount());
@@ -434,7 +434,7 @@ public class ForumSharingIntegrationTest
// assert that the invitation arrived
Group group = contactGroupFactory.createContactGroup(CLIENT_ID,
CLIENT_VERSION, contact0From1);
MAJOR_VERSION, contact0From1);
assertEquals(1, c1.getMessageTracker().getGroupCount(group.getId())
.getMsgCount());