Merge branch '474-alice-flag' into 'master'

IntroduceeProtocolEngine uses wrong role when adding keys

See merge request akwizgran/briar!780

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

@@ -24,6 +24,8 @@ public interface ContactManager {
 	 * Stores a contact associated with the given local and remote pseudonyms,
 	 * derives and stores transport keys for each transport, and returns an ID
 	 * for the contact.
+	 *
+	 * @param alice true if the local party is Alice
 	 */
 	ContactId addContact(Transaction txn, Author remote, AuthorId local,
 			SecretKey master, long timestamp, boolean alice, boolean verified,
@@ -38,7 +40,10 @@ public interface ContactManager {
 
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
-	 * and returns an ID for the contact.
+	 * derives and stores transport keys for each transport, and returns an ID
+	 * for the contact.
+	 *
+	 * @param alice true if the local party is Alice
 	 */
 	ContactId addContact(Author remote, AuthorId local,
 			SecretKey master, long timestamp, boolean alice, boolean verified,

bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeyManager.java

@@ -23,6 +23,8 @@ public interface KeyManager {
 	 * <p/>
 	 * {@link StreamContext StreamContexts} for the contact can be created
 	 * after this method has returned.
+	 *
+	 * @param alice true if the local party is Alice
 	 */
 	void addContact(Transaction txn, ContactId c, SecretKey master,
 			long timestamp, boolean alice) throws DbException;
@@ -33,6 +35,8 @@ public interface KeyManager {
 	 * <p/>
 	 * The keys must be bound before they can be used for incoming streams,
 	 * and also activated before they can be used for outgoing streams.
+	 *
+	 * @param alice true if the local party is Alice
 	 */
 	Map<TransportId, KeySetId> addUnboundKeys(Transaction txn, SecretKey master,
 			long timestamp, boolean alice) throws DbException;
@@ -55,7 +59,7 @@ public interface KeyManager {
 	 * the manager and the database.
 	 */
 	void removeKeys(Transaction txn, Map<TransportId, KeySetId> keys)
-		throws DbException;
+			throws DbException;
 
 	/**
 	 * Returns true if we have keys that can be used for outgoing streams to

briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java

@@ -457,7 +457,7 @@ class IntroduceeProtocolEngine
 			//noinspection ConstantConditions
 			keys = keyManager
 					.addUnboundKeys(txn, new SecretKey(s.getMasterKey()),
-							timestamp, s.getRemote().alice);
+							timestamp, s.getLocal().alice);
 			keyManager.bindKeys(txn, c.getId(), keys);
 
 			// add signed transport properties for the contact