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

Show group invitations and responses in private conversation

Browse Source
This commit is contained in:
Torsten Grote
2016-10-18 10:22:33 -02:00
parent 5ffcdc4e46
commit 42175dca7a
12 changed files with 139 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-api/src/org/briarproject/api/clients/BaseMessage.java
View File

@@ -1,21 +1,26 @@
package org.briarproject.api.clients;
import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.sync.Message;
import org.briarproject.api.sync.MessageId;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public abstract class BaseMessage {
private final Message message;
@Nullable
private final MessageId parent;
public BaseMessage(@NotNull Message message, @Nullable MessageId parent) {
public BaseMessage(Message message, @Nullable MessageId parent) {
this.message = message;
this.parent = parent;
}
@NotNull
public Message getMessage() {
return message;
}

9
briar-api/src/org/briarproject/api/privategroup/GroupMessage.java
View File

@@ -2,17 +2,22 @@ package org.briarproject.api.privategroup;
import org.briarproject.api.clients.BaseMessage;
import org.briarproject.api.identity.Author;
import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.sync.Message;
import org.briarproject.api.sync.MessageId;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class GroupMessage extends BaseMessage {
private final Author author;
public GroupMessage(@NotNull Message message, @Nullable MessageId parent,
@NotNull Author author) {
public GroupMessage(Message message, @Nullable MessageId parent,
Author author) {
super(message, parent);
this.author = author;
}

5
briar-api/src/org/briarproject/api/privategroup/invitation/GroupInvitationItem.java
View File

@@ -1,9 +1,14 @@
package org.briarproject.api.privategroup.invitation;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.sharing.InvitationItem;
import org.briarproject.api.sharing.Shareable;
import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class GroupInvitationItem extends InvitationItem {
private final Contact creator;

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

@@ -8,9 +8,10 @@ import org.briarproject.api.sharing.InvitationRequest;
import org.briarproject.api.sync.GroupId;
import org.briarproject.api.sync.MessageId;
import javax.annotation.concurrent.Immutable;
import javax.annotation.concurrent.ThreadSafe;
@ThreadSafe
@Immutable
@NotNullByDefault
public class GroupInvitationRequest extends InvitationRequest {

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

@@ -9,9 +9,10 @@ import org.briarproject.api.sync.GroupId;
import org.briarproject.api.sync.MessageId;
import org.jetbrains.annotations.NotNull;
import javax.annotation.concurrent.Immutable;
import javax.annotation.concurrent.ThreadSafe;
@ThreadSafe
@Immutable
@NotNullByDefault
public class GroupInvitationResponse extends InvitationResponse {

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

@@ -3,9 +3,10 @@ package org.briarproject.api.sharing;
import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.sync.GroupId;
import javax.annotation.concurrent.Immutable;
import javax.annotation.concurrent.ThreadSafe;
@ThreadSafe
@Immutable
@NotNullByDefault
public abstract class InvitationItem {

5
briar-api/src/org/briarproject/api/sharing/SharingInvitationItem.java
View File

@@ -1,9 +1,14 @@
package org.briarproject.api.sharing;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.nullsafety.NotNullByDefault;
import java.util.Collection;
import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class SharingInvitationItem extends InvitationItem {
private final Collection<Contact> newSharers;