Add database methods for converting a pending contact.

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

@@ -81,6 +81,19 @@ class ContactManagerImpl implements ContactManager {
 		return c;
 	}
 
+	@Override
+	public ContactId addContact(Transaction txn, PendingContactId p,
+			Author remote, AuthorId local, SecretKey rootKey, long timestamp,
+			boolean alice, boolean verified, boolean active)
+			throws DbException {
+		ContactId c = db.addContact(txn, p, remote, local, verified);
+		keyManager.addContactWithRotationKeys(txn, c, rootKey, timestamp,
+				alice, active);
+		Contact contact = db.getContact(txn, c);
+		for (ContactHook hook : hooks) hook.addingContact(txn, contact);
+		return c;
+	}
+
 	@Override
 	public ContactId addContact(Transaction txn, Author remote, AuthorId local,
 			boolean verified) throws DbException {

bramble-core/src/main/java/org/briarproject/bramble/db/Database.java

@@ -630,7 +630,8 @@ interface Database<T> {
 	/**
 	 * Removes the given transport keys from the database.
 	 */
-	void removeTransportKeys(T txn, TransportId t, KeySetId k) throws DbException;
+	void removeTransportKeys(T txn, TransportId t, KeySetId k)
+			throws DbException;
 
 	/**
 	 * Resets the transmission count and expiry time of the given message with
@@ -686,6 +687,14 @@ interface Database<T> {
 	void setTransportKeysActive(T txn, TransportId t, KeySetId k)
 			throws DbException;
 
+	/**
+	 * Transfers ownership of any transport keys from the given pending contact
+	 * to the given contact and copies the pending contact's handshake public
+	 * key to the contact.
+	 */
+	void transferKeys(T txn, PendingContactId p, ContactId c)
+			throws DbException;
+
 	/**
 	 * Updates the transmission count, expiry time and estimated time of arrival
 	 * of the given message with respect to the given contact, using the latency

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java

@@ -248,6 +248,28 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		return c;
 	}
 
+	@Override
+	public ContactId addContact(Transaction transaction, PendingContactId p,
+			Author remote, AuthorId local, boolean verified)
+			throws DbException {
+		if (transaction.isReadOnly()) throw new IllegalArgumentException();
+		T txn = unbox(transaction);
+		if (!db.containsPendingContact(txn, p))
+			throw new NoSuchPendingContactException();
+		if (!db.containsIdentity(txn, local))
+			throw new NoSuchIdentityException();
+		if (db.containsIdentity(txn, remote.getId()))
+			throw new ContactExistsException(local, remote);
+		if (db.containsContact(txn, remote.getId(), local))
+			throw new ContactExistsException(local, remote);
+		ContactId c = db.addContact(txn, remote, local, verified);
+		db.transferKeys(txn, p, c);
+		db.removePendingContact(txn, p);
+		transaction.attach(new ContactAddedEvent(c));
+		transaction.attach(new PendingContactRemovedEvent(p));
+		return c;
+	}
+
 	@Override
 	public void addGroup(Transaction transaction, Group g) throws DbException {
 		if (transaction.isReadOnly()) throw new IllegalArgumentException();

bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java

@@ -3115,6 +3115,48 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
+	@Override
+	public void transferKeys(Connection txn, PendingContactId p, ContactId c)
+			throws DbException {
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		try {
+			// Transfer the handshake public key
+			String sql = "SELECT publicKey from pendingContacts"
+					+ " WHERE pendingContactId = ?";
+			ps = txn.prepareStatement(sql);
+			ps.setBytes(1, p.getBytes());
+			rs = ps.executeQuery();
+			if (!rs.next()) throw new DbStateException();
+			byte[] publicKey = rs.getBytes(1);
+			if (rs.next()) throw new DbStateException();
+			rs.close();
+			ps.close();
+			sql = "UPDATE contacts SET handshakePublicKey = ?"
+					+ " WHERE contactId = ?";
+			ps = txn.prepareStatement(sql);
+			ps.setBytes(1, publicKey);
+			ps.setInt(2, c.getInt());
+			int affected = ps.executeUpdate();
+			if (affected < 0 || affected > 1) throw new DbStateException();
+			ps.close();
+			// Transfer the transport keys
+			sql = "UPDATE outgoingKeys"
+					+ " SET contactId = ?, pendingContactId = NULL"
+					+ " WHERE pendingContactId = ?";
+			ps = txn.prepareStatement(sql);
+			ps.setInt(1, c.getInt());
+			ps.setBytes(2, p.getBytes());
+			affected = ps.executeUpdate();
+			if (affected < 0) throw new DbStateException();
+			ps.close();
+		} catch (SQLException e) {
+			tryToClose(rs, LOG, WARNING);
+			tryToClose(ps, LOG, WARNING);
+			throw new DbException(e);
+		}
+	}
+
 	@Override
 	public void updateExpiryTimeAndEta(Connection txn, ContactId c, MessageId m,
 			int maxLatency) throws DbException {