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

[android] finalize list of pending contacts and add test code

Browse Source
This commit is contained in:
Torsten Grote
2019-02-12 16:15:05 -02:00
parent 66cdf4f595
commit 4a57939b80
13 changed files with 269 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java
View File

@@ -5,6 +5,7 @@ import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.contact.ContactManager;
import org.briarproject.bramble.api.contact.PendingContact;
import org.briarproject.bramble.api.contact.PendingContactId;
import org.briarproject.bramble.api.contact.event.ContactAddedRemotelyEvent;
import org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent;
import org.briarproject.bramble.api.crypto.SecretKey;
import org.briarproject.bramble.api.db.DatabaseComponent;
@@ -19,6 +20,7 @@ import org.briarproject.bramble.api.identity.AuthorInfo;
import org.briarproject.bramble.api.identity.IdentityManager;
import org.briarproject.bramble.api.identity.LocalAuthor;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.system.Scheduler;
import org.briarproject.bramble.api.transport.KeyManager;
import java.util.ArrayList;
@@ -27,12 +29,18 @@ import java.util.List;
import java.util.Random;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService;
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
import javax.inject.Inject;
import static java.lang.System.currentTimeMillis;
import static java.util.concurrent.TimeUnit.SECONDS;
import static java.util.logging.Logger.getLogger;
import static org.briarproject.bramble.api.contact.PendingContactState.ADDING_CONTACT;
import static org.briarproject.bramble.api.contact.PendingContactState.CONNECTED;
import static org.briarproject.bramble.api.contact.PendingContactState.FAILED;
import static org.briarproject.bramble.api.contact.PendingContactState.WAITING_FOR_CONNECTION;
import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
@@ -48,10 +56,12 @@ class ContactManagerImpl implements ContactManager {
private static final String REMOTE_CONTACT_LINK =
"briar://" + getRandomBase32String(LINK_LENGTH);
// TODO remove
// TODO replace with real implementation
private final List<PendingContact> pendingContacts = new ArrayList<>();
@DatabaseExecutor
private final Executor dbExecutor;
@Scheduler
private final ScheduledExecutorService scheduler;
private final DatabaseComponent db;
private final KeyManager keyManager;
@@ -61,11 +71,13 @@ class ContactManagerImpl implements ContactManager {
@Inject
ContactManagerImpl(DatabaseComponent db,
@DatabaseExecutor Executor dbExecutor, KeyManager keyManager,
IdentityManager identityManager) {
IdentityManager identityManager, @Scheduler
ScheduledExecutorService scheduler) {
this.db = db;
this.dbExecutor = dbExecutor;
this.keyManager = keyManager;
this.identityManager = identityManager;
this.scheduler = scheduler;
hooks = new CopyOnWriteArrayList<>();
}
@@ -113,7 +125,7 @@ class ContactManagerImpl implements ContactManager {
return REMOTE_CONTACT_LINK;
}
// TODO remove
// TODO replace with real implementation
@SuppressWarnings("SameParameterValue")
private static String getRandomBase32String(int length) {
Random random = new Random();
@@ -134,23 +146,78 @@ class ContactManagerImpl implements ContactManager {
@Override
public void addRemoteContactRequest(String link, String alias) {
// TODO replace with real implementation
PendingContactId id = new PendingContactId(
link.substring(0, PendingContactId.LENGTH).getBytes());
PendingContact pendingContact =
new PendingContact(id, new byte[MAX_PUBLIC_KEY_LENGTH],
alias, WAITING_FOR_CONNECTION, currentTimeMillis());
dbExecutor.execute(() -> {
try {
Thread.sleep(2000);
Thread.sleep(1500);
} catch (InterruptedException ignored) {
}
PendingContactId id = new PendingContactId(link.getBytes());
PendingContact pendingContact =
new PendingContact(id, new byte[MAX_PUBLIC_KEY_LENGTH],
alias, WAITING_FOR_CONNECTION, currentTimeMillis());
pendingContacts.add(pendingContact);
Event e = new PendingContactStateChangedEvent(id,
WAITING_FOR_CONNECTION);
try {
getLogger("TMP").warning("WAITING_FOR_CONNECTION");
pendingContacts.add(pendingContact);
Event e = new PendingContactStateChangedEvent(id,
WAITING_FOR_CONNECTION);
db.transaction(true, txn -> txn.attach(e));
} catch (DbException ignored) {
}
});
scheduler.schedule(() -> dbExecutor.execute(() -> {
getLogger("TMP").warning("CONNECTED");
pendingContacts.remove(pendingContact);
PendingContact updated = new PendingContact(id,
pendingContact.getPublicKey(), alias, CONNECTED,
pendingContact.getTimestamp());
pendingContacts.add(updated);
Event e = new PendingContactStateChangedEvent(id, CONNECTED);
try {
db.transaction(true, txn -> txn.attach(e));
} catch (DbException ignored) {
}
}), 20, SECONDS);
scheduler.schedule(() -> dbExecutor.execute(() -> {
getLogger("TMP").warning("ADDING_CONTACT");
pendingContacts.remove(pendingContact);
PendingContact updated = new PendingContact(id,
pendingContact.getPublicKey(), alias, ADDING_CONTACT,
pendingContact.getTimestamp());
pendingContacts.add(updated);
Event e =
new PendingContactStateChangedEvent(id, ADDING_CONTACT);
try {
db.transaction(true, txn -> txn.attach(e));
} catch (DbException ignored) {
}
}), 40, SECONDS);
scheduler.schedule(() -> dbExecutor.execute(() -> {
pendingContacts.remove(pendingContact);
Event e;
try {
if (true || new Random().nextBoolean()) {
getLogger("TMP").warning("FAILED");
e = new PendingContactStateChangedEvent(id, FAILED);
PendingContact updated = new PendingContact(id,
pendingContact.getPublicKey(), alias, FAILED,
pendingContact.getTimestamp());
pendingContacts.add(updated);
} else {
getLogger("TMP").warning("ADDED");
ContactId cid = new ContactId(Integer.MAX_VALUE);
AuthorId aid = identityManager.getLocalAuthor().getId();
Contact c = new Contact(cid, null, aid, alias,
new byte[MAX_PUBLIC_KEY_LENGTH], true);
e = new ContactAddedRemotelyEvent(c);
}
db.transaction(true, txn -> txn.attach(e));
} catch (DbException ignored) {
}
}), 60, SECONDS);
}
@Override

5
bramble-core/src/test/java/org/briarproject/bramble/contact/ContactManagerImplTest.java
View File

@@ -24,6 +24,7 @@ import org.junit.Test;
import java.util.Collection;
import java.util.Random;
import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
@@ -59,8 +60,10 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
public ContactManagerImplTest() {
Executor dbExecutor = new ImmediateExecutor();
ScheduledExecutorService scheduler =
context.mock(ScheduledExecutorService.class);
contactManager = new ContactManagerImpl(db, dbExecutor, keyManager,
identityManager);
identityManager, scheduler);
}
@Test