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

Remove unnecessary information from private message classes

Browse Source
This commit is contained in:
Torsten Grote
2018-09-04 15:57:52 -03:00
parent 817df9c75a
commit 2d9345c018
34 changed files with 137 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationRequest.java
View File

@@ -17,7 +17,7 @@ public class BlogInvitationRequest extends InvitationRequest<Blog> {
SessionId sessionId, Blog blog, ContactId contactId,
@Nullable String message, boolean available, boolean canBeOpened) {
super(id, groupId, time, local, sent, seen, read, sessionId, blog,
contactId, message, available, canBeOpened);
message, available, canBeOpened);
}
public String getBlogAuthorName() {

6
briar-api/src/main/java/org/briarproject/briar/api/blog/BlogInvitationResponse.java
View File

@@ -1,6 +1,5 @@
package org.briarproject.briar.api.blog;
import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;
@@ -12,10 +11,9 @@ public class BlogInvitationResponse extends InvitationResponse {
public BlogInvitationResponse(MessageId id, GroupId groupId, long time,
boolean local, boolean sent, boolean seen, boolean read,
SessionId sessionId, GroupId blogId, ContactId contactId,
boolean accept) {
SessionId sessionId, GroupId blogId, boolean accept) {
super(id, groupId, time, local, sent, seen, read, sessionId, blogId,
contactId, accept);
accept);
}
}

58
briar-api/src/main/java/org/briarproject/briar/api/client/BaseMessageHeader.java
View File

@@ -1,58 +0,0 @@
package org.briarproject.briar.api.client;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;
import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public abstract class BaseMessageHeader {
private final MessageId id;
private final GroupId groupId;
private final long timestamp;
private final boolean local, sent, seen, read;
public BaseMessageHeader(MessageId id, GroupId groupId, long timestamp,
boolean local, boolean sent, boolean seen, boolean read) {
this.id = id;
this.groupId = groupId;
this.timestamp = timestamp;
this.local = local;
this.sent = sent;
this.seen = seen;
this.read = read;
}
public MessageId getId() {
return id;
}
public GroupId getGroupId() {
return groupId;
}
public long getTimestamp() {
return timestamp;
}
public boolean isLocal() {
return local;
}
public boolean isSent() {
return sent;
}
public boolean isSeen() {
return seen;
}
public boolean isRead() {
return read;
}
}

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

@@ -19,7 +19,7 @@ public class ForumInvitationRequest extends InvitationRequest<Forum> {
SessionId sessionId, Forum forum, ContactId contactId,
@Nullable String message, boolean available, boolean canBeOpened) {
super(id, groupId, time, local, sent, seen, read, sessionId, forum,
contactId, message, available, canBeOpened);
message, available, canBeOpened);
}
public String getForumName() {

6
briar-api/src/main/java/org/briarproject/briar/api/forum/ForumInvitationResponse.java
View File

@@ -1,6 +1,5 @@
package org.briarproject.briar.api.forum;
import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;
@@ -15,10 +14,9 @@ public class ForumInvitationResponse extends InvitationResponse {
public ForumInvitationResponse(MessageId id, GroupId groupId, long time,
boolean local, boolean sent, boolean seen, boolean read,
SessionId sessionId, GroupId forumId, ContactId contactId,
boolean accept) {
SessionId sessionId, GroupId forumId, boolean accept) {
super(id, groupId, time, local, sent, seen, read, sessionId, forumId,
contactId, accept);
accept);
}
}

21
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionMessage.java
View File

@@ -3,41 +3,26 @@ package org.briarproject.briar.api.introduction;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.briar.api.client.BaseMessageHeader;
import org.briarproject.briar.api.client.SessionId;
import org.briarproject.briar.api.messaging.PrivateMessageHeader;
import javax.annotation.concurrent.Immutable;
import static org.briarproject.briar.api.introduction.Role.INTRODUCER;
@Immutable
@NotNullByDefault
public class IntroductionMessage extends BaseMessageHeader {
public abstract class IntroductionMessage extends PrivateMessageHeader {
private final SessionId sessionId;
private final MessageId messageId;
private final Role role;
IntroductionMessage(SessionId sessionId, MessageId messageId,
GroupId groupId, Role role, long time, boolean local, boolean sent,
GroupId groupId, long time, boolean local, boolean sent,
boolean seen, boolean read) {
super(messageId, groupId, time, local, sent, seen, read);
this.sessionId = sessionId;
this.messageId = messageId;
this.role = role;
}
public SessionId getSessionId() {
return sessionId;
}
public MessageId getMessageId() {
return messageId;
}
public boolean isIntroducer() {
return role == INTRODUCER;
}
}

18
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionRequest.java
View File

@@ -1,5 +1,6 @@
package org.briarproject.briar.api.introduction;
import org.briarproject.bramble.api.identity.Author;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;
@@ -10,25 +11,28 @@ import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class IntroductionRequest extends IntroductionResponse {
public class IntroductionRequest extends IntroductionMessage {
private final Author introducedAuthor;
@Nullable
private final String message;
private final boolean answered, exists;
public IntroductionRequest(SessionId sessionId, MessageId messageId,
GroupId groupId, Role role, long time, boolean local, boolean sent,
boolean seen, boolean read, String name, boolean accepted,
GroupId groupId, long time, boolean local, boolean sent,
boolean seen, boolean read, Author introducedAuthor,
@Nullable String message, boolean answered, boolean exists) {
super(sessionId, messageId, groupId, role, time, local, sent, seen,
read, name, accepted);
super(sessionId, messageId, groupId, time, local, sent, seen, read);
this.introducedAuthor = introducedAuthor;
this.message = message;
this.answered = answered;
this.exists = exists;
}
public String getName() {
return introducedAuthor.getName();
}
@Nullable
public String getMessage() {
return message;

12
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionResponse.java
View File

@@ -7,20 +7,22 @@ import org.briarproject.briar.api.client.SessionId;
import javax.annotation.concurrent.Immutable;
import static org.briarproject.briar.api.introduction.Role.INTRODUCER;
@Immutable
@NotNullByDefault
public class IntroductionResponse extends IntroductionMessage {
private final String name;
private final Role role;
private final boolean accepted;
public IntroductionResponse(SessionId sessionId, MessageId messageId,
GroupId groupId, Role role, long time, boolean local, boolean sent,
boolean seen, boolean read, String name, boolean accepted) {
super(sessionId, messageId, groupId, role, time, local, sent, seen,
read);
super(sessionId, messageId, groupId, time, local, sent, seen, read);
this.name = name;
this.role = role;
this.accepted = accepted;
}
@@ -28,6 +30,10 @@ public class IntroductionResponse extends IntroductionMessage {
return name;
}
public boolean isIntroducer() {
return role == INTRODUCER;
}
public boolean wasAccepted() {
return accepted;
}

43
briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java
View File

@@ -3,18 +3,55 @@ package org.briarproject.briar.api.messaging;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.briar.api.client.BaseMessageHeader;
import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class PrivateMessageHeader extends BaseMessageHeader {
public class PrivateMessageHeader {
private final MessageId id;
private final GroupId groupId;
private final long timestamp;
private final boolean local, sent, seen, read;
public PrivateMessageHeader(MessageId id, GroupId groupId, long timestamp,
boolean local, boolean read, boolean sent, boolean seen) {
this.id = id;
this.groupId = groupId;
this.timestamp = timestamp;
this.local = local;
this.sent = sent;
this.seen = seen;
this.read = read;
}
super(id, groupId, timestamp, local, sent, seen, read);
public MessageId getId() {
return id;
}
public GroupId getGroupId() {
return groupId;
}
public long getTimestamp() {
return timestamp;
}
public boolean isLocal() {
return local;
}
public boolean isSent() {
return sent;
}
public boolean isSeen() {
return seen;
}
public boolean isRead() {
return read;
}
}

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

@@ -20,7 +20,7 @@ public class GroupInvitationRequest extends InvitationRequest<PrivateGroup> {
SessionId sessionId, PrivateGroup shareable, ContactId contactId,
@Nullable String message, boolean available, boolean canBeOpened) {
super(id, groupId, time, local, sent, seen, read, sessionId, shareable,
contactId, message, available, canBeOpened);
message, available, canBeOpened);
}
}

6
briar-api/src/main/java/org/briarproject/briar/api/privategroup/invitation/GroupInvitationResponse.java
View File

@@ -1,6 +1,5 @@
package org.briarproject.briar.api.privategroup.invitation;
import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;
@@ -15,10 +14,9 @@ public class GroupInvitationResponse extends InvitationResponse {
public GroupInvitationResponse(MessageId id, GroupId groupId, long time,
boolean local, boolean sent, boolean seen, boolean read,
SessionId sessionId, GroupId shareableId, ContactId contactId,
boolean accept) {
SessionId sessionId, GroupId shareableId, boolean accept) {
super(id, groupId, time, local, sent, seen, read, sessionId,
shareableId, contactId, accept);
shareableId, accept);
}
}

14
briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationMessage.java
View File

@@ -1,36 +1,28 @@
package org.briarproject.briar.api.sharing;
import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.briar.api.client.BaseMessageHeader;
import org.briarproject.briar.api.client.SessionId;
import org.briarproject.briar.api.messaging.PrivateMessageHeader;
import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class InvitationMessage extends BaseMessageHeader {
public abstract class InvitationMessage extends PrivateMessageHeader {
private final SessionId sessionId;
private final ContactId contactId;
public InvitationMessage(MessageId id, GroupId groupId, long time,
boolean local, boolean sent, boolean seen, boolean read,
SessionId sessionId, ContactId contactId) {
SessionId sessionId) {
super(id, groupId, time, local, sent, seen, read);
this.sessionId = sessionId;
this.contactId = contactId;
}
public SessionId getSessionId() {
return sessionId;
}
public ContactId getContactId() {
return contactId;
}
}

8
briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationRequest.java
View File

@@ -1,6 +1,5 @@
package org.briarproject.briar.api.sharing;
import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;
@@ -11,7 +10,8 @@ import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class InvitationRequest<S extends Shareable> extends InvitationMessage {
public abstract class InvitationRequest<S extends Shareable>
extends InvitationMessage {
private final S shareable;
@Nullable
@@ -20,9 +20,9 @@ public class InvitationRequest<S extends Shareable> extends InvitationMessage {
public InvitationRequest(MessageId id, GroupId groupId, long time,
boolean local, boolean sent, boolean seen, boolean read,
SessionId sessionId, S shareable, ContactId contactId,
SessionId sessionId, S shareable,
@Nullable String message, boolean available, boolean canBeOpened) {
super(id, groupId, time, local, sent, seen, read, sessionId, contactId);
super(id, groupId, time, local, sent, seen, read, sessionId);
this.shareable = shareable;
this.message = message;
this.available = available;

7
briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationResponse.java
View File

@@ -1,6 +1,5 @@
package org.briarproject.briar.api.sharing;
import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;
@@ -10,7 +9,7 @@ import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class InvitationResponse extends InvitationMessage {
public abstract class InvitationResponse extends InvitationMessage {
private final GroupId shareableId;
private final boolean accept;
@@ -18,8 +17,8 @@ public class InvitationResponse extends InvitationMessage {
public InvitationResponse(MessageId id, GroupId groupId,
long time, boolean local, boolean sent, boolean seen,
boolean read, SessionId sessionId, GroupId shareableId,
ContactId contactId, boolean accept) {
super(id, groupId, time, local, sent, seen, read, sessionId, contactId);
boolean accept) {
super(id, groupId, time, local, sent, seen, read, sessionId);
this.shareableId = shareableId;
this.accept = accept;
}

3
briar-api/src/main/java/org/briarproject/briar/api/sharing/Shareable.java
View File

@@ -1,7 +1,6 @@
package org.briarproject.briar.api.sharing;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.Group;
import org.briarproject.bramble.api.sync.GroupId;
@NotNullByDefault
@@ -9,8 +8,6 @@ public interface Shareable {
GroupId getId();
Group getGroup();
String getName();
}