From 05bc3f6a71a1f74a859a5cf70201c1ee09e1f768 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 29 Nov 2017 16:57:00 +0000 Subject: [PATCH] Don't use ClientId.toString() for signature labels. --- .../main/java/org/briarproject/bramble/api/sync/ClientId.java | 4 ++++ .../java/org/briarproject/briar/api/blog/BlogPostFactory.java | 4 ++-- .../org/briarproject/briar/api/forum/ForumPostFactory.java | 2 +- .../briar/api/privategroup/GroupMessageFactory.java | 4 ++-- .../api/privategroup/invitation/GroupInvitationFactory.java | 2 +- .../briarproject/briar/introduction/IntroduceeManager.java | 3 ++- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/ClientId.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/ClientId.java index ee2b3b0ad..9f873b8e9 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/ClientId.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/ClientId.java @@ -36,4 +36,8 @@ public class ClientId implements Comparable { return id.hashCode(); } + @Override + public String toString() { + return id; + } } diff --git a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogPostFactory.java b/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogPostFactory.java index 6a07a18c2..9bfc80696 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogPostFactory.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/blog/BlogPostFactory.java @@ -17,8 +17,8 @@ import static org.briarproject.briar.api.blog.BlogManager.CLIENT_ID; @NotNullByDefault public interface BlogPostFactory { - String SIGNING_LABEL_POST = CLIENT_ID + "/POST"; - String SIGNING_LABEL_COMMENT = CLIENT_ID + "/COMMENT"; + String SIGNING_LABEL_POST = CLIENT_ID.getString() + "/POST"; + String SIGNING_LABEL_COMMENT = CLIENT_ID.getString() + "/COMMENT"; BlogPost createBlogPost(GroupId groupId, long timestamp, @Nullable MessageId parent, LocalAuthor author, String body) diff --git a/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumPostFactory.java b/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumPostFactory.java index a6ff14554..51f47fbe5 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumPostFactory.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/forum/ForumPostFactory.java @@ -16,7 +16,7 @@ import static org.briarproject.briar.api.forum.ForumManager.CLIENT_ID; @NotNullByDefault public interface ForumPostFactory { - String SIGNING_LABEL_POST = CLIENT_ID + "/POST"; + String SIGNING_LABEL_POST = CLIENT_ID.getString() + "/POST"; @CryptoExecutor ForumPost createPost(GroupId groupId, long timestamp, diff --git a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMessageFactory.java b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMessageFactory.java index 0de8ada87..a36ce0be7 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMessageFactory.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMessageFactory.java @@ -13,8 +13,8 @@ import static org.briarproject.briar.api.privategroup.PrivateGroupManager.CLIENT @NotNullByDefault public interface GroupMessageFactory { - String SIGNING_LABEL_JOIN = CLIENT_ID + "/JOIN"; - String SIGNING_LABEL_POST = CLIENT_ID + "/POST"; + String SIGNING_LABEL_JOIN = CLIENT_ID.getString() + "/JOIN"; + String SIGNING_LABEL_POST = CLIENT_ID.getString() + "/POST"; /** * Creates a join announcement message for the creator of a group. diff --git a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationFactory.java b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationFactory.java index f539a0412..a07aee2f8 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationFactory.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationFactory.java @@ -12,7 +12,7 @@ import static org.briarproject.briar.api.privategroup.invitation.GroupInvitation @NotNullByDefault public interface GroupInvitationFactory { - String SIGNING_LABEL_INVITE = CLIENT_ID + "/INVITE"; + String SIGNING_LABEL_INVITE = CLIENT_ID.getString() + "/INVITE"; /** * Returns a signature to include when inviting a member to join a private diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeManager.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeManager.java index f074700ae..846b8b4f6 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeManager.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeManager.java @@ -98,7 +98,8 @@ class IntroduceeManager { private static final Logger LOG = Logger.getLogger(IntroduceeManager.class.getName()); - static final String SIGNING_LABEL_RESPONSE = CLIENT_ID + "/RESPONSE"; + static final String SIGNING_LABEL_RESPONSE = + CLIENT_ID.getString() + "/RESPONSE"; private final MessageSender messageSender; private final DatabaseComponent db;