Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1110-signature-labels' into 'master'

Browse Source 
Don't use ClientId.toString() for signature labels

Closes #1110

See merge request !631
This commit is contained in:
Torsten Grote
2017-11-30 17:03:07 +00:00
parent a1bec1e927 05bc3f6a71
commit ddea031cbf
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bramble-api/src/main/java/org/briarproject/bramble/api/sync/ClientId.java
View File

@@ -36,4 +36,8 @@ public class ClientId implements Comparable<ClientId> {
return id.hashCode();
}
@Override
public String toString() {
return id;
}
}

4
briar-api/src/main/java/org/briarproject/briar/api/blog/BlogPostFactory.java
View File

@@ -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)

2
briar-api/src/main/java/org/briarproject/briar/api/forum/ForumPostFactory.java
View File

@@ -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,

4
briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMessageFactory.java
View File

@@ -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.

2
briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationFactory.java
View File

@@ -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

3
briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeManager.java
View File

@@ -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;