Handle corner cases such as removal during rendezvous.

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

@@ -102,6 +102,7 @@ class ContactManagerImpl implements ContactManager, EventListener {
 			throws DbException, GeneralSecurityException {
 		PendingContact pendingContact = db.getPendingContact(txn, p);
 		db.removePendingContact(txn, p);
+		states.remove(p);
 		PublicKey theirPublicKey = pendingContact.getPublicKey();
 		ContactId c =
 				db.addContact(txn, remote, local, theirPublicKey, verified);
@@ -288,17 +289,13 @@ class ContactManagerImpl implements ContactManager, EventListener {
 		if (e instanceof RendezvousConnectionOpenedEvent) {
 			RendezvousConnectionOpenedEvent r =
 					(RendezvousConnectionOpenedEvent) e;
-			PendingContactId p = r.getPendingContactId();
+			setStateConnected(r.getPendingContactId());
-			setState(p, WAITING_FOR_CONNECTION, ADDING_CONTACT);
 		} else if (e instanceof RendezvousConnectionClosedEvent) {
 			RendezvousConnectionClosedEvent r =
 					(RendezvousConnectionClosedEvent) e;
 			// We're only interested in failures - if the rendezvous succeeds
 			// the pending contact will be removed
-			if (!r.isSuccess()) {
+			if (!r.isSuccess()) setStateDisconnected(r.getPendingContactId());
-				PendingContactId p = r.getPendingContactId();
-				setState(p, ADDING_CONTACT, WAITING_FOR_CONNECTION);
-			}
 		} else if (e instanceof RendezvousFailedEvent) {
 			RendezvousFailedEvent r = (RendezvousFailedEvent) e;
 			setState(r.getPendingContactId(), FAILED);
@@ -313,14 +310,22 @@ class ContactManagerImpl implements ContactManager, EventListener {
 		eventBus.broadcast(new PendingContactStateChangedEvent(p, state));
 	}
 
-	/*
+	private void setStateConnected(PendingContactId p) {
-	 * Sets the state of the given pending contact and broadcasts an event if
+		// Set the state to ADDING_CONTACT if there's no current state or the
-	 * there is no current state or the current state equals {@code expected}.
+		// current state is WAITING_FOR_CONNECTION
-	 */
+		if (states.putIfAbsent(p, ADDING_CONTACT) == null ||
-	private void setState(PendingContactId p, PendingContactState expected,
+				states.replace(p, WAITING_FOR_CONNECTION, ADDING_CONTACT)) {
-			PendingContactState state) {
+			eventBus.broadcast(new PendingContactStateChangedEvent(p,
-		PendingContactState old = states.putIfAbsent(p, state);
+					ADDING_CONTACT));
-		if (old == null || states.replace(p, expected, state))
+		}
-			eventBus.broadcast(new PendingContactStateChangedEvent(p, state));
+	}
+
+	private void setStateDisconnected(PendingContactId p) {
+		// Set the state to WAITING_FOR_CONNECTION if the current state is
+		// ADDING_CONTACT
+		if (states.replace(p, ADDING_CONTACT, WAITING_FOR_CONNECTION)) {
+			eventBus.broadcast(new PendingContactStateChangedEvent(p,
+					WAITING_FOR_CONNECTION));
+		}
 	}
 }

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

@@ -76,6 +76,9 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 	private final KeyPair handshakeKeyPair =
 			new KeyPair(getAgreementPublicKey(), getAgreementPrivateKey());
 	private final PendingContact pendingContact = getPendingContact();
+	private final SecretKey rootKey = getSecretKey();
+	private final long timestamp = System.currentTimeMillis();
+	private final boolean alice = new Random().nextBoolean();
 
 	private ContactManagerImpl contactManager;
 
@@ -87,9 +90,6 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testAddContact() throws Exception {
-		SecretKey rootKey = getSecretKey();
-		long timestamp = System.currentTimeMillis();
-		boolean alice = new Random().nextBoolean();
 		Transaction txn = new Transaction(null, false);
 
 		context.checking(new DbExpectations() {{
@@ -329,7 +329,7 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 	}
 
 	@Test
-	public void testPendingContactFailsBeforeConnection() {
+	public void testPendingContactExpiresBeforeConnection() {
 		// The pending contact expires - the FAILED state is broadcast
 		context.checking(new Expectations() {{
 			oneOf(eventBus).broadcast(with(new PredicateMatcher<>(
@@ -338,6 +338,7 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 		}});
 		contactManager.eventOccurred(new RendezvousFailedEvent(
 				pendingContact.getId()));
+		context.assertIsSatisfied();
 
 		// A rendezvous connection is opened - no state is broadcast
 		contactManager.eventOccurred(new RendezvousConnectionOpenedEvent(
@@ -347,11 +348,10 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 		// The rendezvous connection fails - no state is broadcast
 		contactManager.eventOccurred(new RendezvousConnectionClosedEvent(
 				pendingContact.getId(), false));
-		context.assertIsSatisfied();
 	}
 
 	@Test
-	public void testPendingContactFailsDuringConnection() {
+	public void testPendingContactExpiresDuringFailedConnection() {
 		// A rendezvous connection is opened - the ADDING_CONTACT state is
 		// broadcast
 		context.checking(new Expectations() {{
@@ -370,12 +370,101 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 					PendingContactStateChangedEvent.class, e ->
 					e.getPendingContactState() == FAILED)));
 		}});
+
 		contactManager.eventOccurred(new RendezvousFailedEvent(
 				pendingContact.getId()));
+		context.assertIsSatisfied();
 
 		// The rendezvous connection fails - no state is broadcast
 		contactManager.eventOccurred(new RendezvousConnectionClosedEvent(
 				pendingContact.getId(), false));
+	}
+
+	@Test
+	public void testPendingContactExpiresDuringSuccessfulConnection()
+			throws Exception {
+		Transaction txn = new Transaction(null, false);
+
+		// A rendezvous connection is opened - the ADDING_CONTACT state is
+		// broadcast
+		context.checking(new Expectations() {{
+			oneOf(eventBus).broadcast(with(new PredicateMatcher<>(
+					PendingContactStateChangedEvent.class, e ->
+					e.getPendingContactState() == ADDING_CONTACT)));
+		}});
+
+		contactManager.eventOccurred(new RendezvousConnectionOpenedEvent(
+				pendingContact.getId()));
 		context.assertIsSatisfied();
+
+		// The pending contact expires - the FAILED state is broadcast
+		context.checking(new Expectations() {{
+			oneOf(eventBus).broadcast(with(new PredicateMatcher<>(
+					PendingContactStateChangedEvent.class, e ->
+					e.getPendingContactState() == FAILED)));
+		}});
+
+		contactManager.eventOccurred(new RendezvousFailedEvent(
+				pendingContact.getId()));
+		context.assertIsSatisfied();
+
+		// The pending contact is converted to a contact - no state is broadcast
+		context.checking(new DbExpectations() {{
+			oneOf(db).getPendingContact(txn, pendingContact.getId());
+			will(returnValue(pendingContact));
+			oneOf(db).removePendingContact(txn, pendingContact.getId());
+			oneOf(db).addContact(txn, remote, local,
+					pendingContact.getPublicKey(), verified);
+			will(returnValue(contactId));
+			oneOf(db).setContactAlias(txn, contactId,
+					pendingContact.getAlias());
+			oneOf(identityManager).getHandshakeKeys(txn);
+			will(returnValue(handshakeKeyPair));
+			oneOf(keyManager).addContact(txn, contactId,
+					pendingContact.getPublicKey(), handshakeKeyPair);
+			oneOf(keyManager).addRotationKeys(txn, contactId, rootKey,
+					timestamp, alice, active);
+			oneOf(db).getContact(txn, contactId);
+			will(returnValue(contact));
+		}});
+
+		contactManager.addContact(txn, pendingContact.getId(), remote,
+				local, rootKey, timestamp, alice, verified, active);
+		context.assertIsSatisfied();
+
+		// The rendezvous connection succeeds - no state is broadcast
+		contactManager.eventOccurred(new RendezvousConnectionClosedEvent(
+				pendingContact.getId(), true));
+	}
+
+	@Test
+	public void testPendingContactRemovedDuringFailedConnection()
+			throws Exception {
+		Transaction txn = new Transaction(null, false);
+
+		// A rendezvous connection is opened - the ADDING_CONTACT state is
+		// broadcast
+		context.checking(new Expectations() {{
+			oneOf(eventBus).broadcast(with(new PredicateMatcher<>(
+					PendingContactStateChangedEvent.class, e ->
+					e.getPendingContactState() == ADDING_CONTACT)));
+		}});
+
+		contactManager.eventOccurred(new RendezvousConnectionOpenedEvent(
+				pendingContact.getId()));
+		context.assertIsSatisfied();
+
+		// The pending contact is removed - no state is broadcast
+		context.checking(new DbExpectations() {{
+			oneOf(db).transaction(with(false), withDbRunnable(txn));
+			oneOf(db).removePendingContact(txn, pendingContact.getId());
+		}});
+
+		contactManager.removePendingContact(pendingContact.getId());
+		context.assertIsSatisfied();
+
+		// The rendezvous connection fails - no state is broadcast
+		contactManager.eventOccurred(new RendezvousConnectionClosedEvent(
+				pendingContact.getId(), false));
 	}
 }