diff --git a/briar-android-tests/src/test/java/org/briarproject/BlogSharingIntegrationTest.java b/briar-android-tests/src/test/java/org/briarproject/BlogSharingIntegrationTest.java index 92bbedd71..41fe53fff 100644 --- a/briar-android-tests/src/test/java/org/briarproject/BlogSharingIntegrationTest.java +++ b/briar-android-tests/src/test/java/org/briarproject/BlogSharingIntegrationTest.java @@ -57,6 +57,7 @@ import java.util.logging.Logger; import javax.inject.Inject; import static org.briarproject.TestPluginsModule.MAX_LATENCY; +import static org.briarproject.api.blogs.BlogSharingManager.CLIENT_ID; import static org.briarproject.api.sync.ValidationManager.State.DELIVERED; import static org.briarproject.api.sync.ValidationManager.State.INVALID; import static org.junit.Assert.assertEquals; @@ -189,9 +190,8 @@ public class BlogSharingIntegrationTest extends BriarIntegrationTest { assertEquals(2, blogManager1.getBlogs().size()); // get sharing group and assert group message count - GroupId g = contactGroupFactory - .createContactGroup(blogSharingManager0.getClientId(), - contact1).getId(); + GroupId g = contactGroupFactory.createContactGroup(CLIENT_ID, contact1) + .getId(); assertGroupCount(blogSharingManager0, g, 1, 0); // sync first request message diff --git a/briar-android-tests/src/test/java/org/briarproject/ForumSharingIntegrationTest.java b/briar-android-tests/src/test/java/org/briarproject/ForumSharingIntegrationTest.java index 6cc770b15..896e54e69 100644 --- a/briar-android-tests/src/test/java/org/briarproject/ForumSharingIntegrationTest.java +++ b/briar-android-tests/src/test/java/org/briarproject/ForumSharingIntegrationTest.java @@ -68,6 +68,7 @@ import javax.inject.Inject; import static org.briarproject.TestPluginsModule.MAX_LATENCY; import static org.briarproject.api.forum.ForumConstants.FORUM_SALT_LENGTH; +import static org.briarproject.api.forum.ForumSharingManager.CLIENT_ID; import static org.briarproject.api.sharing.SharingConstants.SHARE_MSG_TYPE_INVITATION; import static org.briarproject.api.sync.ValidationManager.State.DELIVERED; import static org.briarproject.api.sync.ValidationManager.State.INVALID; @@ -495,8 +496,7 @@ public class ForumSharingIntegrationTest extends BriarTestCase { MessageQueueManager queue = t0.getMessageQueueManager(); Contact c1 = contactManager0.getContact(contactId1); ContactGroupFactory groupFactory = t0.getContactGroupFactory(); - Group group = groupFactory - .createContactGroup(forumSharingManager0.getClientId(), c1); + Group group = groupFactory.createContactGroup(CLIENT_ID, c1); long time = clock.currentTimeMillis(); BdfList bodyList = BdfList.of(SHARE_MSG_TYPE_INVITATION, sessionId.getBytes(), @@ -691,8 +691,7 @@ public class ForumSharingIntegrationTest extends BriarTestCase { MessageQueueManager queue = t0.getMessageQueueManager(); Contact c1 = contactManager0.getContact(contactId1); ContactGroupFactory groupFactory = t0.getContactGroupFactory(); - Group group = groupFactory - .createContactGroup(forumSharingManager0.getClientId(), c1); + Group group = groupFactory.createContactGroup(CLIENT_ID, c1); long time = clock.currentTimeMillis(); // construct a new message re-using the old SessionId diff --git a/briar-android-tests/src/test/java/org/briarproject/PrivateGroupManagerTest.java b/briar-android-tests/src/test/java/org/briarproject/PrivateGroupManagerTest.java index 2b07de345..38ace43a3 100644 --- a/briar-android-tests/src/test/java/org/briarproject/PrivateGroupManagerTest.java +++ b/briar-android-tests/src/test/java/org/briarproject/PrivateGroupManagerTest.java @@ -60,6 +60,7 @@ import javax.inject.Inject; import static org.briarproject.TestPluginsModule.MAX_LATENCY; import static org.briarproject.TestUtils.getRandomBytes; import static org.briarproject.api.identity.Author.Status.VERIFIED; +import static org.briarproject.api.privategroup.invitation.GroupInvitationManager.CLIENT_ID; import static org.briarproject.api.sync.ValidationManager.State.DELIVERED; import static org.briarproject.api.sync.ValidationManager.State.INVALID; import static org.briarproject.api.sync.ValidationManager.State.PENDING; @@ -341,8 +342,8 @@ public class PrivateGroupManagerTest extends BriarIntegrationTest { joinTime = clock.currentTimeMillis(); long inviteTime = joinTime; Group invitationGroup = contactGroupFactory - .createContactGroup(groupInvitationManager.getClientId(), - author0.getId(), author1.getId()); + .createContactGroup(CLIENT_ID, author0.getId(), + author1.getId()); BdfList toSign = BdfList.of(0, inviteTime, invitationGroup.getId(), privateGroup0.getId()); byte[] creatorSignature = @@ -386,8 +387,8 @@ public class PrivateGroupManagerTest extends BriarIntegrationTest { long joinTime = clock.currentTimeMillis(); long inviteTime = joinTime - 1; Group invitationGroup = contactGroupFactory - .createContactGroup(groupInvitationManager.getClientId(), - author0.getId(), author0.getId()); + .createContactGroup(CLIENT_ID, author0.getId(), + author0.getId()); BdfList toSign = BdfList.of(0, inviteTime, invitationGroup.getId(), privateGroup0.getId()); byte[] creatorSignature = @@ -412,8 +413,8 @@ public class PrivateGroupManagerTest extends BriarIntegrationTest { joinTime = clock.currentTimeMillis(); inviteTime = joinTime - 1; invitationGroup = contactGroupFactory - .createContactGroup(groupInvitationManager.getClientId(), - author0.getId(), author1.getId()); + .createContactGroup(CLIENT_ID, author0.getId(), + author1.getId()); toSign = BdfList.of(0, inviteTime, invitationGroup.getId(), privateGroup0.getId()); // signature uses joiner's key, not creator's key @@ -540,8 +541,8 @@ public class PrivateGroupManagerTest extends BriarIntegrationTest { joinTime = clock.currentTimeMillis(); long inviteTime = joinTime - 1; Group invitationGroup = contactGroupFactory - .createContactGroup(groupInvitationManager.getClientId(), - author0.getId(), author1.getId()); + .createContactGroup(CLIENT_ID, author0.getId(), + author1.getId()); BdfList toSign = BdfList.of(0, inviteTime, invitationGroup.getId(), privateGroup0.getId()); byte[] creatorSignature = diff --git a/briar-android-tests/src/test/java/org/briarproject/SyncIntegrationTest.java b/briar-android-tests/src/test/java/org/briarproject/SyncIntegrationTest.java index 5b8aae38c..07a671747 100644 --- a/briar-android-tests/src/test/java/org/briarproject/SyncIntegrationTest.java +++ b/briar-android-tests/src/test/java/org/briarproject/SyncIntegrationTest.java @@ -74,7 +74,7 @@ public class SyncIntegrationTest extends BriarTestCase { headerKey = TestUtils.getSecretKey(); streamNumber = 123; // Create a group - ClientId clientId = new ClientId(TestUtils.getRandomId()); + ClientId clientId = new ClientId(TestUtils.getRandomString(5)); byte[] descriptor = new byte[0]; Group group = groupFactory.createGroup(clientId, descriptor); // Add two messages to the group diff --git a/briar-android/src/org/briarproject/android/blogs/FeedControllerImpl.java b/briar-android/src/org/briarproject/android/blogs/FeedControllerImpl.java index faf626b54..33cce78e2 100644 --- a/briar-android/src/org/briarproject/android/blogs/FeedControllerImpl.java +++ b/briar-android/src/org/briarproject/android/blogs/FeedControllerImpl.java @@ -25,6 +25,7 @@ import javax.inject.Inject; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; +import static org.briarproject.api.blogs.BlogManager.CLIENT_ID; public class FeedControllerImpl extends BaseControllerImpl implements FeedController { @@ -62,7 +63,7 @@ public class FeedControllerImpl extends BaseControllerImpl onBlogPostAdded(b.getHeader(), b.isLocal()); } else if (e instanceof GroupRemovedEvent) { GroupRemovedEvent g = (GroupRemovedEvent) e; - if (g.getGroup().getClientId().equals(blogManager.getClientId())) { + if (g.getGroup().getClientId().equals(CLIENT_ID)) { LOG.info("Blog removed"); onBlogRemoved(); } diff --git a/briar-android/src/org/briarproject/android/forum/ForumListFragment.java b/briar-android/src/org/briarproject/android/forum/ForumListFragment.java index 2afce8316..9fb886f43 100644 --- a/briar-android/src/org/briarproject/android/forum/ForumListFragment.java +++ b/briar-android/src/org/briarproject/android/forum/ForumListFragment.java @@ -44,6 +44,7 @@ import javax.inject.Inject; import static android.support.design.widget.Snackbar.LENGTH_INDEFINITE; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; +import static org.briarproject.api.forum.ForumManager.CLIENT_ID; public class ForumListFragment extends BaseEventFragment implements OnClickListener { @@ -236,13 +237,13 @@ public class ForumListFragment extends BaseEventFragment implements loadAvailableForums(); } else if (e instanceof GroupAddedEvent) { GroupAddedEvent g = (GroupAddedEvent) e; - if (g.getGroup().getClientId().equals(forumManager.getClientId())) { + if (g.getGroup().getClientId().equals(CLIENT_ID)) { LOG.info("Forum added, reloading forums"); loadForums(); } } else if (e instanceof GroupRemovedEvent) { GroupRemovedEvent g = (GroupRemovedEvent) e; - if (g.getGroup().getClientId().equals(forumManager.getClientId())) { + if (g.getGroup().getClientId().equals(CLIENT_ID)) { LOG.info("Forum removed, removing from list"); removeForum(g.getGroup().getId()); } diff --git a/briar-android/src/org/briarproject/android/privategroup/invitation/GroupInvitationControllerImpl.java b/briar-android/src/org/briarproject/android/privategroup/invitation/GroupInvitationControllerImpl.java index b48a87437..9dba77d89 100644 --- a/briar-android/src/org/briarproject/android/privategroup/invitation/GroupInvitationControllerImpl.java +++ b/briar-android/src/org/briarproject/android/privategroup/invitation/GroupInvitationControllerImpl.java @@ -21,6 +21,7 @@ import java.util.concurrent.Executor; import javax.inject.Inject; import static java.util.logging.Level.WARNING; +import static org.briarproject.api.privategroup.PrivateGroupManager.CLIENT_ID; public class GroupInvitationControllerImpl extends InvitationControllerImpl @@ -51,7 +52,7 @@ public class GroupInvitationControllerImpl @Override protected ClientId getShareableClientId() { - return privateGroupManager.getClientId(); + return CLIENT_ID; } @Override diff --git a/briar-android/src/org/briarproject/android/privategroup/list/GroupListControllerImpl.java b/briar-android/src/org/briarproject/android/privategroup/list/GroupListControllerImpl.java index 4524e484b..ee5cb7be4 100644 --- a/briar-android/src/org/briarproject/android/privategroup/list/GroupListControllerImpl.java +++ b/briar-android/src/org/briarproject/android/privategroup/list/GroupListControllerImpl.java @@ -33,6 +33,7 @@ import javax.inject.Inject; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; +import static org.briarproject.api.privategroup.PrivateGroupManager.CLIENT_ID; public class GroupListControllerImpl extends DbControllerImpl implements GroupListController, EventListener { @@ -92,14 +93,14 @@ public class GroupListControllerImpl extends DbControllerImpl } else if (e instanceof GroupAddedEvent) { GroupAddedEvent g = (GroupAddedEvent) e; ClientId id = g.getGroup().getClientId(); - if (id.equals(groupManager.getClientId())) { + if (id.equals(CLIENT_ID)) { LOG.info("Private group added"); onGroupAdded(g.getGroup().getId()); } } else if (e instanceof GroupRemovedEvent) { GroupRemovedEvent g = (GroupRemovedEvent) e; ClientId id = g.getGroup().getClientId(); - if (id.equals(groupManager.getClientId())) { + if (id.equals(CLIENT_ID)) { LOG.info("Private group removed"); onGroupRemoved(g.getGroup().getId()); } diff --git a/briar-android/src/org/briarproject/android/sharing/BlogInvitationControllerImpl.java b/briar-android/src/org/briarproject/android/sharing/BlogInvitationControllerImpl.java index 49507b4f4..54227624f 100644 --- a/briar-android/src/org/briarproject/android/sharing/BlogInvitationControllerImpl.java +++ b/briar-android/src/org/briarproject/android/sharing/BlogInvitationControllerImpl.java @@ -20,6 +20,7 @@ import java.util.concurrent.Executor; import javax.inject.Inject; import static java.util.logging.Level.WARNING; +import static org.briarproject.api.blogs.BlogManager.CLIENT_ID; public class BlogInvitationControllerImpl extends InvitationControllerImpl @@ -49,7 +50,7 @@ public class BlogInvitationControllerImpl @Override protected ClientId getShareableClientId() { - return blogManager.getClientId(); + return CLIENT_ID; } @Override diff --git a/briar-android/src/org/briarproject/android/sharing/ForumInvitationControllerImpl.java b/briar-android/src/org/briarproject/android/sharing/ForumInvitationControllerImpl.java index 4418900b8..ef5634927 100644 --- a/briar-android/src/org/briarproject/android/sharing/ForumInvitationControllerImpl.java +++ b/briar-android/src/org/briarproject/android/sharing/ForumInvitationControllerImpl.java @@ -20,6 +20,7 @@ import java.util.concurrent.Executor; import javax.inject.Inject; import static java.util.logging.Level.WARNING; +import static org.briarproject.api.forum.ForumManager.CLIENT_ID; public class ForumInvitationControllerImpl extends InvitationControllerImpl @@ -50,7 +51,7 @@ public class ForumInvitationControllerImpl @Override protected ClientId getShareableClientId() { - return forumManager.getClientId(); + return CLIENT_ID; } @Override diff --git a/briar-api/src/org/briarproject/api/blogs/BlogManager.java b/briar-api/src/org/briarproject/api/blogs/BlogManager.java index 62e4349dd..6b0f28ec1 100644 --- a/briar-api/src/org/briarproject/api/blogs/BlogManager.java +++ b/briar-api/src/org/briarproject/api/blogs/BlogManager.java @@ -13,8 +13,8 @@ import java.util.Collection; public interface BlogManager { - /** Returns the unique ID of the blog client. */ - ClientId getClientId(); + /** Unique ID of the blog client. */ + ClientId CLIENT_ID = new ClientId("org.briarproject.briar.blogs"); /** Returns true if a blog can be removed. */ boolean canBeRemoved(GroupId g) throws DbException; diff --git a/briar-api/src/org/briarproject/api/blogs/BlogSharingManager.java b/briar-api/src/org/briarproject/api/blogs/BlogSharingManager.java index 8584dff59..10ee0ff84 100644 --- a/briar-api/src/org/briarproject/api/blogs/BlogSharingManager.java +++ b/briar-api/src/org/briarproject/api/blogs/BlogSharingManager.java @@ -1,7 +1,10 @@ package org.briarproject.api.blogs; import org.briarproject.api.sharing.SharingManager; +import org.briarproject.api.sync.ClientId; public interface BlogSharingManager extends SharingManager { + ClientId CLIENT_ID = new ClientId("org.briarproject.briar.blogs.sharing"); + } diff --git a/briar-api/src/org/briarproject/api/feed/FeedManager.java b/briar-api/src/org/briarproject/api/feed/FeedManager.java index 2edb0d9be..a643cc429 100644 --- a/briar-api/src/org/briarproject/api/feed/FeedManager.java +++ b/briar-api/src/org/briarproject/api/feed/FeedManager.java @@ -9,8 +9,8 @@ import java.util.List; public interface FeedManager { - /** Returns the unique ID of the client. */ - ClientId getClientId(); + /** The unique ID of the RSS feed client. */ + ClientId CLIENT_ID = new ClientId("org.briarproject.briar.feed"); /** Adds a RSS feed. */ void addFeed(String url, GroupId g) throws DbException, IOException; diff --git a/briar-api/src/org/briarproject/api/forum/ForumManager.java b/briar-api/src/org/briarproject/api/forum/ForumManager.java index 51af10a1c..37aadb723 100644 --- a/briar-api/src/org/briarproject/api/forum/ForumManager.java +++ b/briar-api/src/org/briarproject/api/forum/ForumManager.java @@ -14,8 +14,8 @@ import java.util.Collection; public interface ForumManager extends MessageTracker { - /** Returns the unique ID of the forum client. */ - ClientId getClientId(); + /** The unique ID of the forum client. */ + ClientId CLIENT_ID = new ClientId("org.briarproject.briar.forum"); /** Subscribes to a forum. */ Forum addForum(String name) throws DbException; diff --git a/briar-api/src/org/briarproject/api/forum/ForumSharingManager.java b/briar-api/src/org/briarproject/api/forum/ForumSharingManager.java index ec0135c75..b2f99acf6 100644 --- a/briar-api/src/org/briarproject/api/forum/ForumSharingManager.java +++ b/briar-api/src/org/briarproject/api/forum/ForumSharingManager.java @@ -1,7 +1,10 @@ package org.briarproject.api.forum; import org.briarproject.api.sharing.SharingManager; +import org.briarproject.api.sync.ClientId; public interface ForumSharingManager extends SharingManager { + ClientId CLIENT_ID = new ClientId("org.briarproject.briar.forum.sharing"); + } diff --git a/briar-api/src/org/briarproject/api/introduction/IntroductionManager.java b/briar-api/src/org/briarproject/api/introduction/IntroductionManager.java index 3f2fcea12..6914318d8 100644 --- a/briar-api/src/org/briarproject/api/introduction/IntroductionManager.java +++ b/briar-api/src/org/briarproject/api/introduction/IntroductionManager.java @@ -12,8 +12,8 @@ import java.util.Collection; public interface IntroductionManager extends MessageTracker { - /** Returns the unique ID of the introduction client. */ - ClientId getClientId(); + /** The unique ID of the introduction client. */ + ClientId CLIENT_ID = new ClientId("org.briarproject.briar.introduction"); /** * sends two initial introduction messages diff --git a/briar-api/src/org/briarproject/api/messaging/MessagingManager.java b/briar-api/src/org/briarproject/api/messaging/MessagingManager.java index bf03e188c..c6de1772f 100644 --- a/briar-api/src/org/briarproject/api/messaging/MessagingManager.java +++ b/briar-api/src/org/briarproject/api/messaging/MessagingManager.java @@ -11,8 +11,8 @@ import java.util.Collection; public interface MessagingManager extends MessageTracker { - /** Returns the unique ID of the messaging client. */ - ClientId getClientId(); + /** The unique ID of the messaging client. */ + ClientId CLIENT_ID = new ClientId("org.briarproject.briar.messaging"); /** Stores a local private message. */ void addLocalMessage(PrivateMessage m) throws DbException; diff --git a/briar-api/src/org/briarproject/api/privategroup/PrivateGroupManager.java b/briar-api/src/org/briarproject/api/privategroup/PrivateGroupManager.java index d0ed0d750..85b190452 100644 --- a/briar-api/src/org/briarproject/api/privategroup/PrivateGroupManager.java +++ b/briar-api/src/org/briarproject/api/privategroup/PrivateGroupManager.java @@ -14,8 +14,8 @@ import java.util.Collection; @NotNullByDefault public interface PrivateGroupManager extends MessageTracker { - /** Returns the unique ID of the private group client. */ - ClientId getClientId(); + /** The unique ID of the private group client. */ + ClientId CLIENT_ID = new ClientId("org.briarproject.briar.privategroup"); /** * Adds a new private group and joins it. diff --git a/briar-api/src/org/briarproject/api/privategroup/invitation/GroupInvitationManager.java b/briar-api/src/org/briarproject/api/privategroup/invitation/GroupInvitationManager.java index a5ca33dae..745b69fc8 100644 --- a/briar-api/src/org/briarproject/api/privategroup/invitation/GroupInvitationManager.java +++ b/briar-api/src/org/briarproject/api/privategroup/invitation/GroupInvitationManager.java @@ -14,8 +14,9 @@ import java.util.Collection; public interface GroupInvitationManager extends MessageTracker { - /** Returns the unique ID of the private group invitation client. */ - ClientId getClientId(); + /** The unique ID of the private group invitation client. */ + ClientId CLIENT_ID = + new ClientId("org.briarproject.briar.privategroup.invitation"); /** * Sends an invitation to share the given forum with the given contact diff --git a/briar-api/src/org/briarproject/api/properties/TransportPropertyManager.java b/briar-api/src/org/briarproject/api/properties/TransportPropertyManager.java index 38fedd9fb..b7da722fd 100644 --- a/briar-api/src/org/briarproject/api/properties/TransportPropertyManager.java +++ b/briar-api/src/org/briarproject/api/properties/TransportPropertyManager.java @@ -4,11 +4,15 @@ import org.briarproject.api.TransportId; import org.briarproject.api.contact.ContactId; import org.briarproject.api.db.DbException; import org.briarproject.api.db.Transaction; +import org.briarproject.api.sync.ClientId; import java.util.Map; public interface TransportPropertyManager { + /** The unique ID of the transport property client. */ + ClientId CLIENT_ID = new ClientId("org.briarproject.briar.properties"); + /** * Stores the given properties received while adding a contact - they will * be superseded by any properties synced from the contact. diff --git a/briar-api/src/org/briarproject/api/sharing/SharingManager.java b/briar-api/src/org/briarproject/api/sharing/SharingManager.java index c7b1c8004..934818f95 100644 --- a/briar-api/src/org/briarproject/api/sharing/SharingManager.java +++ b/briar-api/src/org/briarproject/api/sharing/SharingManager.java @@ -5,18 +5,12 @@ import org.briarproject.api.clients.SessionId; import org.briarproject.api.contact.Contact; import org.briarproject.api.contact.ContactId; import org.briarproject.api.db.DbException; -import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.GroupId; import java.util.Collection; public interface SharingManager extends MessageTracker { - /** - * Returns the unique ID of the group sharing client. - */ - ClientId getClientId(); - /** * Sends an invitation to share the given group with the given contact * and sends an optional message along with it. diff --git a/briar-api/src/org/briarproject/api/sync/ClientId.java b/briar-api/src/org/briarproject/api/sync/ClientId.java index 7fd5456c1..7101b3106 100644 --- a/briar-api/src/org/briarproject/api/sync/ClientId.java +++ b/briar-api/src/org/briarproject/api/sync/ClientId.java @@ -1,18 +1,39 @@ package org.briarproject.api.sync; -import org.briarproject.api.UniqueId; +import org.briarproject.api.nullsafety.NotNullByDefault; + +import javax.annotation.concurrent.Immutable; /** - * Type-safe wrapper for a byte array that uniquely identifies a sync client. + * Wrapper for a name-spaced string that uniquely identifies a sync client. */ -public class ClientId extends UniqueId { +@Immutable +@NotNullByDefault +public class ClientId implements Comparable { - public ClientId(byte[] id) { - super(id); + private final String id; + + public ClientId(String id) { + this.id = id; + } + + public String getString() { + return id; + } + + @Override + public int compareTo(ClientId clientId) { + return id.compareTo(clientId.getString()); } @Override public boolean equals(Object o) { - return o instanceof ClientId && super.equals(o); + return o instanceof ClientId && id.equals(((ClientId) o).id); } + + @Override + public int hashCode() { + return id.hashCode(); + } + } diff --git a/briar-core/src/org/briarproject/blogs/BlogManagerImpl.java b/briar-core/src/org/briarproject/blogs/BlogManagerImpl.java index 455e17c2f..e591fd2d2 100644 --- a/briar-core/src/org/briarproject/blogs/BlogManagerImpl.java +++ b/briar-core/src/org/briarproject/blogs/BlogManagerImpl.java @@ -27,13 +27,11 @@ import org.briarproject.api.identity.Author.Status; import org.briarproject.api.identity.AuthorId; import org.briarproject.api.identity.IdentityManager; import org.briarproject.api.identity.LocalAuthor; -import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; import org.briarproject.api.sync.MessageId; import org.briarproject.clients.BdfIncomingMessageHook; -import org.briarproject.util.StringUtils; import org.jetbrains.annotations.Nullable; import java.security.GeneralSecurityException; @@ -74,10 +72,6 @@ import static org.briarproject.blogs.BlogPostValidator.authorToBdfDictionary; class BlogManagerImpl extends BdfIncomingMessageHook implements BlogManager, AddContactHook, RemoveContactHook, Client { - static final ClientId CLIENT_ID = new ClientId(StringUtils.fromHexString( - "dafbe56f0c8971365cea4bb5f08ec9a6" + - "1d686e058b943997b6ff259ba423f613")); - private final IdentityManager identityManager; private final ContactManager contactManager; private final BlogFactory blogFactory; @@ -98,11 +92,6 @@ class BlogManagerImpl extends BdfIncomingMessageHook implements BlogManager, removeHooks = new CopyOnWriteArrayList(); } - @Override - public ClientId getClientId() { - return CLIENT_ID; - } - @Override public void createLocalState(Transaction txn) throws DbException { // Ensure that the local identity has its own personal blog diff --git a/briar-core/src/org/briarproject/db/JdbcDatabase.java b/briar-core/src/org/briarproject/db/JdbcDatabase.java index 913add501..3ee7fadd6 100644 --- a/briar-core/src/org/briarproject/db/JdbcDatabase.java +++ b/briar-core/src/org/briarproject/db/JdbcDatabase.java @@ -67,8 +67,8 @@ import static org.briarproject.db.ExponentialBackoff.calculateExpiry; */ abstract class JdbcDatabase implements Database { - private static final int SCHEMA_VERSION = 27; - private static final int MIN_SCHEMA_VERSION = 27; + private static final int SCHEMA_VERSION = 28; + private static final int MIN_SCHEMA_VERSION = 28; private static final String CREATE_SETTINGS = "CREATE TABLE settings" @@ -103,7 +103,7 @@ abstract class JdbcDatabase implements Database { private static final String CREATE_GROUPS = "CREATE TABLE groups" + " (groupId HASH NOT NULL," - + " clientId HASH NOT NULL," + + " clientId VARCHAR NOT NULL," + " descriptor BINARY NOT NULL," + " PRIMARY KEY (groupId))"; @@ -504,7 +504,7 @@ abstract class JdbcDatabase implements Database { + " VALUES (?, ?, ?)"; ps = txn.prepareStatement(sql); ps.setBytes(1, g.getId().getBytes()); - ps.setBytes(2, g.getClientId().getBytes()); + ps.setString(2, g.getClientId().getString()); ps.setBytes(3, g.getDescriptor()); int affected = ps.executeUpdate(); if (affected != 1) throw new DbStateException(); @@ -1091,7 +1091,7 @@ abstract class JdbcDatabase implements Database { ps.setBytes(1, g.getBytes()); rs = ps.executeQuery(); if (!rs.next()) throw new DbStateException(); - ClientId clientId = new ClientId(rs.getBytes(1)); + ClientId clientId = new ClientId(rs.getString(1)); byte[] descriptor = rs.getBytes(2); rs.close(); ps.close(); @@ -1111,7 +1111,7 @@ abstract class JdbcDatabase implements Database { String sql = "SELECT groupId, descriptor FROM groups" + " WHERE clientId = ?"; ps = txn.prepareStatement(sql); - ps.setBytes(1, c.getBytes()); + ps.setString(1, c.getString()); rs = ps.executeQuery(); List groups = new ArrayList(); while (rs.next()) { @@ -1678,7 +1678,7 @@ abstract class JdbcDatabase implements Database { + " WHERE state = ? AND clientId = ? AND raw IS NOT NULL"; ps = txn.prepareStatement(sql); ps.setInt(1, state.getValue()); - ps.setBytes(2, c.getBytes()); + ps.setString(2, c.getString()); rs = ps.executeQuery(); List ids = new ArrayList(); while (rs.next()) ids.add(new MessageId(rs.getBytes(1))); @@ -1707,7 +1707,7 @@ abstract class JdbcDatabase implements Database { + " WHERE m.shared = FALSE AND m1.shared = TRUE" + " AND g.clientId = ?"; ps = txn.prepareStatement(sql); - ps.setBytes(1, c.getBytes()); + ps.setString(1, c.getString()); rs = ps.executeQuery(); List ids = new ArrayList(); while (rs.next()) ids.add(new MessageId(rs.getBytes(1))); diff --git a/briar-core/src/org/briarproject/feed/FeedManagerImpl.java b/briar-core/src/org/briarproject/feed/FeedManagerImpl.java index 11e98eeac..b2229a60c 100644 --- a/briar-core/src/org/briarproject/feed/FeedManagerImpl.java +++ b/briar-core/src/org/briarproject/feed/FeedManagerImpl.java @@ -30,7 +30,6 @@ import org.briarproject.api.identity.IdentityManager; import org.briarproject.api.identity.LocalAuthor; import org.briarproject.api.lifecycle.IoExecutor; import org.briarproject.api.plugins.TorConstants; -import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.system.Clock; @@ -73,11 +72,6 @@ class FeedManagerImpl implements FeedManager, Client, EventListener { private static final Logger LOG = Logger.getLogger(FeedManagerImpl.class.getName()); - private static final ClientId CLIENT_ID = - new ClientId(StringUtils.fromHexString( - "466565644d616e6167657202fb797097" - + "255af837abbf8c16e250b3c2ccc286eb")); - private static final int CONNECT_TIMEOUT = 60 * 1000; // Milliseconds private final ScheduledExecutorService feedExecutor; @@ -114,11 +108,6 @@ class FeedManagerImpl implements FeedManager, Client, EventListener { this.torSocketFactory = torSocketFactory; } - @Override - public ClientId getClientId() { - return CLIENT_ID; - } - @Override public void eventOccurred(Event e) { if (e instanceof TransportEnabledEvent) { @@ -510,7 +499,7 @@ class FeedManagerImpl implements FeedManager, Client, EventListener { } private Group getLocalGroup() { - return contactGroupFactory.createLocalGroup(getClientId()); + return contactGroupFactory.createLocalGroup(CLIENT_ID); } } diff --git a/briar-core/src/org/briarproject/forum/ForumManagerImpl.java b/briar-core/src/org/briarproject/forum/ForumManagerImpl.java index 8cd1d9f0e..db82d71c1 100644 --- a/briar-core/src/org/briarproject/forum/ForumManagerImpl.java +++ b/briar-core/src/org/briarproject/forum/ForumManagerImpl.java @@ -20,13 +20,11 @@ import org.briarproject.api.identity.Author.Status; import org.briarproject.api.identity.AuthorId; import org.briarproject.api.identity.IdentityManager; import org.briarproject.api.identity.LocalAuthor; -import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; import org.briarproject.api.sync.MessageId; import org.briarproject.clients.BdfIncomingMessageHook; -import org.briarproject.util.StringUtils; import org.jetbrains.annotations.Nullable; import java.security.GeneralSecurityException; @@ -56,10 +54,6 @@ import static org.briarproject.clients.BdfConstants.MSG_KEY_READ; class ForumManagerImpl extends BdfIncomingMessageHook implements ForumManager { - static final ClientId CLIENT_ID = new ClientId(StringUtils.fromHexString( - "859a7be50dca035b64bd6902fb797097" - + "795af837abbf8c16d750b3c2ccc186ea")); - private final IdentityManager identityManager; private final ForumFactory forumFactory; private final ForumPostFactory forumPostFactory; @@ -92,11 +86,6 @@ class ForumManagerImpl extends BdfIncomingMessageHook implements ForumManager { return true; } - @Override - public ClientId getClientId() { - return CLIENT_ID; - } - @Override public Forum addForum(String name) throws DbException { Forum f = forumFactory.createForum(name); diff --git a/briar-core/src/org/briarproject/forum/ForumModule.java b/briar-core/src/org/briarproject/forum/ForumModule.java index 4a2e6a798..0cc501d0a 100644 --- a/briar-core/src/org/briarproject/forum/ForumModule.java +++ b/briar-core/src/org/briarproject/forum/ForumModule.java @@ -32,9 +32,8 @@ public class ForumModule { ForumManager provideForumManager(ForumManagerImpl forumManager, ValidationManager validationManager) { - validationManager - .registerIncomingMessageHook(forumManager.getClientId(), - forumManager); + validationManager.registerIncomingMessageHook(ForumManager.CLIENT_ID, + forumManager); return forumManager; } diff --git a/briar-core/src/org/briarproject/introduction/IntroductionManagerImpl.java b/briar-core/src/org/briarproject/introduction/IntroductionManagerImpl.java index 7c3e2361f..30cae32f4 100644 --- a/briar-core/src/org/briarproject/introduction/IntroductionManagerImpl.java +++ b/briar-core/src/org/briarproject/introduction/IntroductionManagerImpl.java @@ -23,14 +23,12 @@ import org.briarproject.api.introduction.IntroductionManager; import org.briarproject.api.introduction.IntroductionMessage; import org.briarproject.api.introduction.IntroductionRequest; import org.briarproject.api.introduction.IntroductionResponse; -import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; import org.briarproject.api.sync.MessageId; import org.briarproject.api.sync.MessageStatus; import org.briarproject.clients.ConversationClientImpl; -import org.briarproject.util.StringUtils; import java.util.ArrayList; import java.util.Arrays; @@ -79,10 +77,6 @@ class IntroductionManagerImpl extends ConversationClientImpl implements IntroductionManager, Client, AddContactHook, RemoveContactHook { - static final ClientId CLIENT_ID = new ClientId(StringUtils.fromHexString( - "23b1897c198a90ae75b976ac023d0f32" - + "80ca67b12f2346b2c23a34f34e2434c3")); - private static final Logger LOG = Logger.getLogger(IntroductionManagerImpl.class.getName()); @@ -102,11 +96,6 @@ class IntroductionManagerImpl extends ConversationClientImpl this.introductionGroupFactory = introductionGroupFactory; } - @Override - public ClientId getClientId() { - return CLIENT_ID; - } - @Override public void createLocalState(Transaction txn) throws DbException { db.addGroup(txn, introductionGroupFactory.createLocalGroup()); diff --git a/briar-core/src/org/briarproject/introduction/IntroductionModule.java b/briar-core/src/org/briarproject/introduction/IntroductionModule.java index 989100ff8..14a92654e 100644 --- a/briar-core/src/org/briarproject/introduction/IntroductionModule.java +++ b/briar-core/src/org/briarproject/introduction/IntroductionModule.java @@ -15,6 +15,7 @@ import javax.inject.Singleton; import dagger.Module; import dagger.Provides; +import static org.briarproject.api.introduction.IntroductionManager.CLIENT_ID; import static org.briarproject.api.sync.ValidationManager.MessageValidator; @Module @@ -28,16 +29,14 @@ public class IntroductionModule { @Provides @Singleton MessageValidator provideValidator(MessageQueueManager messageQueueManager, - IntroductionManager introductionManager, MetadataEncoder metadataEncoder, ClientHelper clientHelper, Clock clock) { IntroductionValidator introductionValidator = new IntroductionValidator( clientHelper, metadataEncoder, clock); - messageQueueManager.registerMessageValidator( - introductionManager.getClientId(), - introductionValidator); + messageQueueManager + .registerMessageValidator(CLIENT_ID, introductionValidator); return introductionValidator; } @@ -54,9 +53,8 @@ public class IntroductionModule { lifecycleManager.registerClient(introductionManager); contactManager.registerAddContactHook(introductionManager); contactManager.registerRemoveContactHook(introductionManager); - messageQueueManager.registerIncomingMessageHook( - introductionManager.getClientId(), - introductionManager); + messageQueueManager + .registerIncomingMessageHook(CLIENT_ID, introductionManager); conversationManager.registerConversationClient(introductionManager); return introductionManager; diff --git a/briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java b/briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java index bf1825299..624bf1b74 100644 --- a/briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java +++ b/briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java @@ -18,14 +18,12 @@ import org.briarproject.api.event.PrivateMessageReceivedEvent; import org.briarproject.api.messaging.MessagingManager; import org.briarproject.api.messaging.PrivateMessage; import org.briarproject.api.messaging.PrivateMessageHeader; -import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; import org.briarproject.api.sync.MessageId; import org.briarproject.api.sync.MessageStatus; import org.briarproject.clients.ConversationClientImpl; -import org.briarproject.util.StringUtils; import java.util.ArrayList; import java.util.Collection; @@ -38,10 +36,6 @@ import static org.briarproject.clients.BdfConstants.MSG_KEY_READ; class MessagingManagerImpl extends ConversationClientImpl implements MessagingManager, Client, AddContactHook, RemoveContactHook { - static final ClientId CLIENT_ID = new ClientId(StringUtils.fromHexString( - "6bcdc006c0910b0f44e40644c3b31f1a" - + "8bf9a6d6021d40d219c86b731b903070")); - private final ContactGroupFactory contactGroupFactory; @Inject @@ -87,11 +81,6 @@ class MessagingManagerImpl extends ConversationClientImpl db.removeGroup(txn, getContactGroup(c)); } - @Override - public ClientId getClientId() { - return CLIENT_ID; - } - @Override protected boolean incomingMessage(Transaction txn, Message m, BdfList body, BdfDictionary meta) throws DbException, FormatException { diff --git a/briar-core/src/org/briarproject/privategroup/GroupMessageValidator.java b/briar-core/src/org/briarproject/privategroup/GroupMessageValidator.java index e71624317..e1613b045 100644 --- a/briar-core/src/org/briarproject/privategroup/GroupMessageValidator.java +++ b/briar-core/src/org/briarproject/privategroup/GroupMessageValidator.java @@ -12,7 +12,6 @@ import org.briarproject.api.identity.AuthorFactory; import org.briarproject.api.privategroup.MessageType; import org.briarproject.api.privategroup.PrivateGroup; import org.briarproject.api.privategroup.PrivateGroupFactory; -import org.briarproject.api.privategroup.invitation.GroupInvitationManager; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.InvalidMessageException; import org.briarproject.api.sync.Message; @@ -30,6 +29,7 @@ import static org.briarproject.api.identity.AuthorConstants.MAX_SIGNATURE_LENGTH import static org.briarproject.api.privategroup.MessageType.JOIN; import static org.briarproject.api.privategroup.MessageType.POST; import static org.briarproject.api.privategroup.PrivateGroupConstants.MAX_GROUP_POST_BODY_LENGTH; +import static org.briarproject.api.privategroup.invitation.GroupInvitationManager.CLIENT_ID; import static org.briarproject.privategroup.Constants.KEY_MEMBER_ID; import static org.briarproject.privategroup.Constants.KEY_MEMBER_NAME; import static org.briarproject.privategroup.Constants.KEY_MEMBER_PUBLIC_KEY; @@ -44,18 +44,15 @@ class GroupMessageValidator extends BdfMessageValidator { private final ContactGroupFactory contactGroupFactory; private final PrivateGroupFactory groupFactory; private final AuthorFactory authorFactory; - private final GroupInvitationManager groupInvitationManager; // TODO remove GroupMessageValidator(ContactGroupFactory contactGroupFactory, PrivateGroupFactory groupFactory, ClientHelper clientHelper, MetadataEncoder metadataEncoder, - Clock clock, AuthorFactory authorFactory, - GroupInvitationManager groupInvitationManager) { + Clock clock, AuthorFactory authorFactory) { super(clientHelper, metadataEncoder, clock); this.contactGroupFactory = contactGroupFactory; this.groupFactory = groupFactory; this.authorFactory = authorFactory; - this.groupInvitationManager = groupInvitationManager; } @Override @@ -125,8 +122,8 @@ class GroupMessageValidator extends BdfMessageValidator { // derive invitation group Group invitationGroup = contactGroupFactory - .createContactGroup(groupInvitationManager.getClientId(), - pg.getAuthor().getId(), member.getId()); + .createContactGroup(CLIENT_ID, pg.getAuthor().getId(), + member.getId()); // signature with the creator's private key // over a list with four elements: diff --git a/briar-core/src/org/briarproject/privategroup/PrivateGroupManagerImpl.java b/briar-core/src/org/briarproject/privategroup/PrivateGroupManagerImpl.java index 4b2ab0266..49b5bc2f1 100644 --- a/briar-core/src/org/briarproject/privategroup/PrivateGroupManagerImpl.java +++ b/briar-core/src/org/briarproject/privategroup/PrivateGroupManagerImpl.java @@ -23,13 +23,11 @@ import org.briarproject.api.privategroup.MessageType; import org.briarproject.api.privategroup.PrivateGroup; import org.briarproject.api.privategroup.PrivateGroupFactory; import org.briarproject.api.privategroup.PrivateGroupManager; -import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; import org.briarproject.api.sync.MessageId; import org.briarproject.clients.BdfIncomingMessageHook; -import org.briarproject.util.StringUtils; import java.util.ArrayList; import java.util.Arrays; @@ -64,10 +62,6 @@ import static org.briarproject.privategroup.Constants.KEY_TYPE; public class PrivateGroupManagerImpl extends BdfIncomingMessageHook implements PrivateGroupManager { - static final ClientId CLIENT_ID = new ClientId( - StringUtils.fromHexString("5072697661746547726f75704d616e61" - + "67657220627920546f727374656e2047")); - private final PrivateGroupFactory privateGroupFactory; private final IdentityManager identityManager; private final List hooks; @@ -84,11 +78,6 @@ public class PrivateGroupManagerImpl extends BdfIncomingMessageHook implements hooks = new CopyOnWriteArrayList(); } - @Override - public ClientId getClientId() { - return CLIENT_ID; - } - @Override public void addPrivateGroup(PrivateGroup group, GroupMessage joinMsg) throws DbException { @@ -251,7 +240,7 @@ public class PrivateGroupManagerImpl extends BdfIncomingMessageHook implements Collection groups; Transaction txn = db.startTransaction(true); try { - groups = db.getGroups(txn, getClientId()); + groups = db.getGroups(txn, CLIENT_ID); db.commitTransaction(txn); } finally { db.endTransaction(txn); diff --git a/briar-core/src/org/briarproject/privategroup/PrivateGroupModule.java b/briar-core/src/org/briarproject/privategroup/PrivateGroupModule.java index 2c60d7207..b4c80cbab 100644 --- a/briar-core/src/org/briarproject/privategroup/PrivateGroupModule.java +++ b/briar-core/src/org/briarproject/privategroup/PrivateGroupModule.java @@ -38,7 +38,7 @@ public class PrivateGroupModule { ValidationManager validationManager) { validationManager - .registerIncomingMessageHook(groupManager.getClientId(), + .registerIncomingMessageHook(PrivateGroupManager.CLIENT_ID, groupManager); return groupManager; @@ -68,9 +68,9 @@ public class PrivateGroupModule { GroupMessageValidator validator = new GroupMessageValidator( contactGroupFactory, groupFactory, clientHelper, - metadataEncoder, clock, authorFactory, groupInvitationManager); + metadataEncoder, clock, authorFactory); validationManager.registerMessageValidator( - PrivateGroupManagerImpl.CLIENT_ID, validator); + PrivateGroupManager.CLIENT_ID, validator); return validator; } @@ -84,7 +84,7 @@ public class PrivateGroupModule { ValidationManager validationManager) { validationManager.registerIncomingMessageHook( - groupInvitationManager.getClientId(), groupInvitationManager); + GroupInvitationManager.CLIENT_ID, groupInvitationManager); lifecycleManager.registerClient(groupInvitationManager); contactManager.registerAddContactHook(groupInvitationManager); contactManager.registerRemoveContactHook(groupInvitationManager); diff --git a/briar-core/src/org/briarproject/privategroup/invitation/GroupInvitationManagerImpl.java b/briar-core/src/org/briarproject/privategroup/invitation/GroupInvitationManagerImpl.java index 12477ab20..f7dba6e1f 100644 --- a/briar-core/src/org/briarproject/privategroup/invitation/GroupInvitationManagerImpl.java +++ b/briar-core/src/org/briarproject/privategroup/invitation/GroupInvitationManagerImpl.java @@ -19,12 +19,10 @@ import org.briarproject.api.privategroup.PrivateGroup; import org.briarproject.api.privategroup.invitation.GroupInvitationItem; import org.briarproject.api.privategroup.invitation.GroupInvitationManager; import org.briarproject.api.sharing.InvitationMessage; -import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; import org.briarproject.clients.ConversationClientImpl; -import org.briarproject.util.StringUtils; import java.util.ArrayList; import java.util.Collection; @@ -38,11 +36,6 @@ public class GroupInvitationManagerImpl extends ConversationClientImpl ContactManager.AddContactHook, ContactManager.RemoveContactHook, ConversationManager.ConversationClient { - private static final ClientId CLIENT_ID = - new ClientId(StringUtils.fromHexString( - "B55231ABFC4A10666CD93D649B1D7F4F" - + "016E65B87BB4C04F4E35613713DBCD13")); - private final ContactGroupFactory contactGroupFactory; private final Group localGroup; @@ -52,12 +45,7 @@ public class GroupInvitationManagerImpl extends ConversationClientImpl ContactGroupFactory contactGroupFactory) { super(db, clientHelper, metadataParser); this.contactGroupFactory = contactGroupFactory; - localGroup = contactGroupFactory.createLocalGroup(getClientId()); - } - - @Override - public ClientId getClientId() { - return CLIENT_ID; + localGroup = contactGroupFactory.createLocalGroup(CLIENT_ID); } @Override @@ -94,7 +82,7 @@ public class GroupInvitationManagerImpl extends ConversationClientImpl @Override protected Group getContactGroup(Contact c) { - return contactGroupFactory.createContactGroup(getClientId(), c); + return contactGroupFactory.createContactGroup(CLIENT_ID, c); } @Override diff --git a/briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java b/briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java index cabfe6d05..b0900795e 100644 --- a/briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java +++ b/briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java @@ -16,13 +16,11 @@ import org.briarproject.api.db.DbException; import org.briarproject.api.db.Transaction; import org.briarproject.api.properties.TransportProperties; import org.briarproject.api.properties.TransportPropertyManager; -import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; import org.briarproject.api.sync.MessageId; import org.briarproject.api.system.Clock; -import org.briarproject.util.StringUtils; import java.util.Collections; import java.util.HashMap; @@ -34,10 +32,6 @@ import javax.inject.Inject; class TransportPropertyManagerImpl implements TransportPropertyManager, Client, AddContactHook, RemoveContactHook { - static final ClientId CLIENT_ID = new ClientId(StringUtils.fromHexString( - "673ea091673561e28f70122f6a8ea8f4" - + "97c3624b86fa07f785bb15f09fb87b4b")); - private final DatabaseComponent db; private final ClientHelper clientHelper; private final ContactGroupFactory contactGroupFactory; diff --git a/briar-core/src/org/briarproject/sharing/BlogSharingManagerImpl.java b/briar-core/src/org/briarproject/sharing/BlogSharingManagerImpl.java index 5429ef96d..39533d7d9 100644 --- a/briar-core/src/org/briarproject/sharing/BlogSharingManagerImpl.java +++ b/briar-core/src/org/briarproject/sharing/BlogSharingManagerImpl.java @@ -33,7 +33,6 @@ import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.MessageId; import org.briarproject.api.system.Clock; -import org.briarproject.util.StringUtils; import java.security.SecureRandom; @@ -48,10 +47,6 @@ class BlogSharingManagerImpl extends SharingManagerImpl implements BlogSharingManager, RemoveBlogHook { - static final ClientId CLIENT_ID = new ClientId(StringUtils.fromHexString( - "bee438b5de0b3a685badc4e49d76e72d" - + "21e01c4b569a775112756bdae267a028")); - private final IdentityManager identityManager; private final BlogManager blogManager; @@ -84,7 +79,7 @@ class BlogSharingManagerImpl extends } @Override - public ClientId getClientId() { + protected ClientId getClientId() { return CLIENT_ID; } diff --git a/briar-core/src/org/briarproject/sharing/ForumSharingManagerImpl.java b/briar-core/src/org/briarproject/sharing/ForumSharingManagerImpl.java index 092cf96f5..d4c04971a 100644 --- a/briar-core/src/org/briarproject/sharing/ForumSharingManagerImpl.java +++ b/briar-core/src/org/briarproject/sharing/ForumSharingManagerImpl.java @@ -27,7 +27,6 @@ import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.MessageId; import org.briarproject.api.system.Clock; -import org.briarproject.util.StringUtils; import java.security.SecureRandom; @@ -42,10 +41,6 @@ class ForumSharingManagerImpl extends SharingManagerImpl implements ForumSharingManager, ForumManager.RemoveForumHook { - static final ClientId CLIENT_ID = new ClientId(StringUtils.fromHexString( - "cd11a5d04dccd9e2931d6fc3df456313" - + "63bb3e9d9d0e9405fccdb051f41f5449")); - private final SFactory sFactory; private final IFactory iFactory; private final ISFactory isFactory; @@ -75,7 +70,7 @@ class ForumSharingManagerImpl extends } @Override - public ClientId getClientId() { + protected ClientId getClientId() { return CLIENT_ID; } diff --git a/briar-core/src/org/briarproject/sharing/SharingManagerImpl.java b/briar-core/src/org/briarproject/sharing/SharingManagerImpl.java index 32591209f..cd525096c 100644 --- a/briar-core/src/org/briarproject/sharing/SharingManagerImpl.java +++ b/briar-core/src/org/briarproject/sharing/SharingManagerImpl.java @@ -25,10 +25,11 @@ import org.briarproject.api.event.Event; import org.briarproject.api.event.InvitationRequestReceivedEvent; import org.briarproject.api.event.InvitationResponseReceivedEvent; import org.briarproject.api.identity.LocalAuthor; -import org.briarproject.api.sharing.SharingInvitationItem; import org.briarproject.api.sharing.InvitationMessage; import org.briarproject.api.sharing.Shareable; +import org.briarproject.api.sharing.SharingInvitationItem; import org.briarproject.api.sharing.SharingManager; +import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; @@ -115,6 +116,8 @@ abstract class SharingManagerImpl groups = new ArrayList<>(); for (int i = 0; i < 100; i++) { GroupId id = new GroupId(TestUtils.getRandomId()); - ClientId clientId = new ClientId(TestUtils.getRandomId()); + ClientId clientId = new ClientId(TestUtils.getRandomString(5)); byte[] descriptor = new byte[0]; groups.add(new Group(id, clientId, descriptor)); } diff --git a/briar-tests/src/org/briarproject/introduction/IntroductionManagerImplTest.java b/briar-tests/src/org/briarproject/introduction/IntroductionManagerImplTest.java index 8bb138be3..e3c7d2ea5 100644 --- a/briar-tests/src/org/briarproject/introduction/IntroductionManagerImplTest.java +++ b/briar-tests/src/org/briarproject/introduction/IntroductionManagerImplTest.java @@ -82,7 +82,7 @@ public class IntroductionManagerImplTest extends BriarTestCase { introducee2 = new Contact(contactId2, author2, localAuthorId2, true, true); - ClientId clientId = new ClientId(TestUtils.getRandomId()); + ClientId clientId = new ClientId(TestUtils.getRandomString(5)); introductionGroup1 = new Group(new GroupId(TestUtils.getRandomId()), clientId, new byte[0]); introductionGroup2 = new Group(new GroupId(TestUtils.getRandomId()), diff --git a/briar-tests/src/org/briarproject/introduction/IntroductionValidatorTest.java b/briar-tests/src/org/briarproject/introduction/IntroductionValidatorTest.java index 19ea3b62b..3c1be62ab 100644 --- a/briar-tests/src/org/briarproject/introduction/IntroductionValidatorTest.java +++ b/briar-tests/src/org/briarproject/introduction/IntroductionValidatorTest.java @@ -59,7 +59,7 @@ public class IntroductionValidatorTest extends BriarTestCase { public IntroductionValidatorTest() { GroupId groupId = new GroupId(TestUtils.getRandomId()); - ClientId clientId = new ClientId(TestUtils.getRandomId()); + ClientId clientId = new ClientId(TestUtils.getRandomString(5)); byte[] descriptor = TestUtils.getRandomBytes(12); group = new Group(groupId, clientId, descriptor); diff --git a/briar-tests/src/org/briarproject/introduction/MessageSenderTest.java b/briar-tests/src/org/briarproject/introduction/MessageSenderTest.java index bf3fdde3c..56415f41c 100644 --- a/briar-tests/src/org/briarproject/introduction/MessageSenderTest.java +++ b/briar-tests/src/org/briarproject/introduction/MessageSenderTest.java @@ -61,7 +61,8 @@ public class MessageSenderTest extends BriarTestCase { final Transaction txn = new Transaction(null, false); final Group privateGroup = new Group(new GroupId(TestUtils.getRandomId()), - new ClientId(TestUtils.getRandomId()), new byte[0]); + new ClientId(TestUtils.getRandomString(5)), + new byte[0]); final SessionId sessionId = new SessionId(TestUtils.getRandomId()); byte[] mac = TestUtils.getRandomBytes(42); byte[] sig = TestUtils.getRandomBytes(MAX_SIGNATURE_LENGTH); diff --git a/briar-tests/src/org/briarproject/properties/TransportPropertyValidatorTest.java b/briar-tests/src/org/briarproject/properties/TransportPropertyValidatorTest.java index f719479f1..a7798148c 100644 --- a/briar-tests/src/org/briarproject/properties/TransportPropertyValidatorTest.java +++ b/briar-tests/src/org/briarproject/properties/TransportPropertyValidatorTest.java @@ -36,7 +36,7 @@ public class TransportPropertyValidatorTest extends BriarTestCase { bdfDictionary = new BdfDictionary(); GroupId groupId = new GroupId(TestUtils.getRandomId()); - ClientId clientId = new ClientId(TestUtils.getRandomId()); + ClientId clientId = new ClientId(TestUtils.getRandomString(5)); byte[] descriptor = TestUtils.getRandomBytes(12); group = new Group(groupId, clientId, descriptor); diff --git a/briar-tests/src/org/briarproject/sync/ValidationManagerImplTest.java b/briar-tests/src/org/briarproject/sync/ValidationManagerImplTest.java index edfc71548..373f94f80 100644 --- a/briar-tests/src/org/briarproject/sync/ValidationManagerImplTest.java +++ b/briar-tests/src/org/briarproject/sync/ValidationManagerImplTest.java @@ -39,7 +39,8 @@ import static org.briarproject.api.sync.ValidationManager.State.UNKNOWN; public class ValidationManagerImplTest extends BriarTestCase { - private final ClientId clientId = new ClientId(TestUtils.getRandomId()); + private final ClientId clientId = + new ClientId(TestUtils.getRandomString(5)); private final MessageId messageId = new MessageId(TestUtils.getRandomId()); private final MessageId messageId1 = new MessageId(TestUtils.getRandomId()); private final MessageId messageId2 = new MessageId(TestUtils.getRandomId());