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

Address review comments

Browse Source
This commit is contained in:
Torsten Grote
2016-10-28 15:15:36 -02:00
parent 7b627bb427
commit 2cc650d85f
39 changed files with 209 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-api/src/org/briarproject/api/event/GroupInvitationReceivedEvent.java
View File

@@ -3,12 +3,13 @@ package org.briarproject.api.event;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.forum.ForumInvitationRequest;
import org.briarproject.api.privategroup.PrivateGroup;
import org.briarproject.api.privategroup.invitation.GroupInvitationRequest;
public class GroupInvitationReceivedEvent extends
InvitationRequestReceivedEvent<PrivateGroup> {
public GroupInvitationReceivedEvent(PrivateGroup group, ContactId contactId,
ForumInvitationRequest request) {
GroupInvitationRequest request) {
super(group, contactId, request);
}

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

@@ -2,18 +2,18 @@ package org.briarproject.api.privategroup.invitation;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.privategroup.PrivateGroup;
import org.briarproject.api.sharing.InvitationItem;
import org.briarproject.api.sharing.Shareable;
import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class GroupInvitationItem extends InvitationItem {
public class GroupInvitationItem extends InvitationItem<PrivateGroup> {
private final Contact creator;
public GroupInvitationItem(Shareable shareable, boolean subscribed,
public GroupInvitationItem(PrivateGroup shareable, boolean subscribed,
Contact creator) {
super(shareable, subscribed);

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

@@ -4,21 +4,20 @@ import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.sync.GroupId;
import javax.annotation.concurrent.Immutable;
import javax.annotation.concurrent.ThreadSafe;
@Immutable
@NotNullByDefault
public abstract class InvitationItem {
public abstract class InvitationItem<S extends Shareable> {
private final Shareable shareable;
private final S shareable;
private final boolean subscribed;
public InvitationItem(Shareable shareable, boolean subscribed) {
public InvitationItem(S shareable, boolean subscribed) {
this.shareable = shareable;
this.subscribed = subscribed;
}
public Shareable getShareable() {
public S getShareable() {
return shareable;
}

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

@@ -9,7 +9,7 @@ import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class SharingInvitationItem extends InvitationItem {
public class SharingInvitationItem extends InvitationItem<Shareable> {
private final Collection<Contact> newSharers;