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

Move introduction role into IntroductionResponse

Browse Source
This commit is contained in:
Torsten Grote
2018-09-07 14:13:38 -03:00
parent fcf7cf72ea
commit d430b4fd2d
13 changed files with 34 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
briar-api/src/main/java/org/briarproject/briar/api/introduction/Introduction.java
View File

@@ -1,32 +0,0 @@
package org.briarproject.briar.api.introduction;
import org.briarproject.bramble.api.identity.Author;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.api.messaging.Nameable;
import javax.annotation.concurrent.Immutable;
import static org.briarproject.briar.api.introduction.Role.INTRODUCER;
@Immutable
@NotNullByDefault
public class Introduction implements Nameable {
private final Author introducedAuthor;
private final Role ourRole;
public Introduction(Author introducedAuthor, Role ourRole) {
this.introducedAuthor = introducedAuthor;
this.ourRole = ourRole;
}
@Override
public String getName() {
return introducedAuthor.getName();
}
public boolean isIntroducer() {
return ourRole == INTRODUCER;
}
}

9
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;
@@ -11,16 +12,16 @@ import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class IntroductionRequest extends PrivateRequest<Introduction> {
public class IntroductionRequest extends PrivateRequest<Author> {
private final boolean contact;
public IntroductionRequest(MessageId messageId, GroupId groupId,
long time, boolean local, boolean sent, boolean seen, boolean read,
SessionId sessionId, Introduction introduction,
@Nullable String message, boolean answered, boolean contact) {
SessionId sessionId, Author author, @Nullable String message,
boolean answered, boolean contact) {
super(messageId, groupId, time, local, sent, seen, read, sessionId,
introduction, message, answered);
author, message, answered);
this.contact = contact;
}

16
briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionResponse.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;
@@ -8,15 +9,24 @@ import org.briarproject.briar.api.messaging.PrivateResponse;
import javax.annotation.concurrent.Immutable;
import static org.briarproject.briar.api.introduction.Role.INTRODUCER;
@Immutable
@NotNullByDefault
public class IntroductionResponse extends PrivateResponse<Introduction> {
public class IntroductionResponse extends PrivateResponse<Author> {
private final Role ourRole;
public IntroductionResponse(MessageId messageId, GroupId groupId, long time,
boolean local, boolean sent, boolean seen, boolean read,
SessionId sessionId, Introduction introduction, boolean accepted) {
SessionId sessionId, Author author, boolean accepted, Role role) {
super(messageId, groupId, time, local, sent, seen, read, sessionId,
introduction, accepted);
author, accepted);
this.ourRole = role;
}
public boolean isIntroducer() {
return ourRole == INTRODUCER;
}
}

10
briar-api/src/main/java/org/briarproject/briar/api/messaging/Nameable.java
View File

@@ -1,10 +0,0 @@
package org.briarproject.briar.api.messaging;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
public interface Nameable {
String getName();
}

1
briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateRequest.java
View File

@@ -1,5 +1,6 @@
package org.briarproject.briar.api.messaging;
import org.briarproject.bramble.api.Nameable;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;

1
briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateResponse.java
View File

@@ -1,5 +1,6 @@
package org.briarproject.briar.api.messaging;
import org.briarproject.bramble.api.Nameable;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;

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

@@ -2,7 +2,7 @@ package org.briarproject.briar.api.sharing;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.briar.api.messaging.Nameable;
import org.briarproject.bramble.api.Nameable;
@NotNullByDefault
public interface Shareable extends Nameable {