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

Add public key to pending contacts.

Browse Source
This commit is contained in:
akwizgran
2019-04-17 15:30:15 +01:00
parent 296ce080e2
commit 3aadcc17dd
6 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java
View File

@@ -77,7 +77,8 @@ public interface ContactManager {
Collection<PendingContact> getPendingContacts();
/**
* Removes a {@link PendingContact} that is in state {@link FAILED}.
* Removes a {@link PendingContact} that is in state
* {@link PendingContactState FAILED}.
*/
void removePendingContact(PendingContact pendingContact);

11
bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContact.java
View File

@@ -9,13 +9,15 @@ import javax.annotation.concurrent.Immutable;
public class PendingContact {
private final PendingContactId id;
private final byte[] publicKey;
private final String alias;
private final PendingContactState state;
private final long timestamp;
public PendingContact(PendingContactId id, String alias,
PendingContactState state, long timestamp) {
public PendingContact(PendingContactId id, byte[] publicKey,
String alias, PendingContactState state, long timestamp) {
this.id = id;
this.publicKey = publicKey;
this.alias = alias;
this.state = state;
this.timestamp = timestamp;
@@ -25,6 +27,10 @@ public class PendingContact {
return id;
}
public byte[] getPublicKey() {
return publicKey;
}
public String getAlias() {
return alias;
}
@@ -47,5 +53,4 @@ public class PendingContact {
return o instanceof PendingContact &&
id.equals(((PendingContact) o).id);
}
}

4
bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java
View File

@@ -149,8 +149,10 @@ public class TestUtils {
public static PendingContact getPendingContact(int nameLength) {
PendingContactId id = new PendingContactId(getRandomId());
byte[] publicKey = getRandomBytes(MAX_PUBLIC_KEY_LENGTH);
String alias = getRandomString(nameLength);
return new PendingContact(id, alias, WAITING_FOR_CONNECTION, timestamp);
return new PendingContact(id, publicKey, alias, WAITING_FOR_CONNECTION,
timestamp);
}
public static double getMedian(Collection<? extends Number> samples) {