Merge branch '1434-message-attachments' into 'master'

Add attachment API for sending/retreiving private messages

See merge request briar/briar!976

briar-core/src/main/java/org/briarproject/briar/client/ConversationClientImpl.java

@@ -12,7 +12,7 @@ import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.client.MessageTracker;
 import org.briarproject.briar.api.client.MessageTracker.GroupCount;
-import org.briarproject.briar.api.messaging.ConversationManager.ConversationClient;
+import org.briarproject.briar.api.conversation.ConversationManager.ConversationClient;
 
 import javax.annotation.concurrent.Immutable;
 

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

@@ -31,11 +31,11 @@ import org.briarproject.bramble.api.versioning.ClientVersioningManager;
 import org.briarproject.bramble.api.versioning.ClientVersioningManager.ClientVersioningHook;
 import org.briarproject.briar.api.client.MessageTracker;
 import org.briarproject.briar.api.client.SessionId;
+import org.briarproject.briar.api.conversation.ConversationMessageHeader;
 import org.briarproject.briar.api.introduction.IntroductionManager;
 import org.briarproject.briar.api.introduction.IntroductionRequest;
 import org.briarproject.briar.api.introduction.IntroductionResponse;
 import org.briarproject.briar.api.introduction.Role;
-import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.client.ConversationClientImpl;
 import org.briarproject.briar.introduction.IntroducerSession.Introducee;
 
@@ -401,15 +401,15 @@ class IntroductionManagerImpl extends ConversationClientImpl
 	}
 
 	@Override
-	public Collection<PrivateMessageHeader> getMessageHeaders(Transaction txn,
-			ContactId c) throws DbException {
+	public Collection<ConversationMessageHeader> getMessageHeaders(
+			Transaction txn, ContactId c) throws DbException {
 		try {
 			Contact contact = db.getContact(txn, c);
 			GroupId contactGroupId = getContactGroup(contact).getId();
 			BdfDictionary query = messageParser.getMessagesVisibleInUiQuery();
 			Map<MessageId, BdfDictionary> results = clientHelper
 					.getMessageMetadataAsDictionary(txn, contactGroupId, query);
-			List<PrivateMessageHeader> messages =
+			List<ConversationMessageHeader> messages =
 					new ArrayList<>(results.size());
 			Map<AuthorId, AuthorInfo> authorInfos = new HashMap<>();
 			for (Entry<MessageId, BdfDictionary> e : results.entrySet()) {

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

@@ -8,7 +8,7 @@ import org.briarproject.bramble.api.sync.ValidationManager;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.versioning.ClientVersioningManager;
 import org.briarproject.briar.api.introduction.IntroductionManager;
-import org.briarproject.briar.api.messaging.ConversationManager;
+import org.briarproject.briar.api.conversation.ConversationManager;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

briar-core/src/main/java/org/briarproject/briar/messaging/ConversationManagerImpl.java

@@ -6,8 +6,8 @@ import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.client.MessageTracker.GroupCount;
-import org.briarproject.briar.api.messaging.ConversationManager;
-import org.briarproject.briar.api.messaging.PrivateMessageHeader;
+import org.briarproject.briar.api.conversation.ConversationManager;
+import org.briarproject.briar.api.conversation.ConversationMessageHeader;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -38,9 +38,9 @@ class ConversationManagerImpl implements ConversationManager {
 	}
 
 	@Override
-	public Collection<PrivateMessageHeader> getMessageHeaders(ContactId c)
+	public Collection<ConversationMessageHeader> getMessageHeaders(ContactId c)
 			throws DbException {
-		List<PrivateMessageHeader> messages = new ArrayList<>();
+		List<ConversationMessageHeader> messages = new ArrayList<>();
 		Transaction txn = db.startTransaction(true);
 		try {
 			for (ConversationClient client : clients) {

briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java

@@ -23,19 +23,26 @@ import org.briarproject.bramble.api.sync.MessageStatus;
 import org.briarproject.bramble.api.versioning.ClientVersioningManager;
 import org.briarproject.bramble.api.versioning.ClientVersioningManager.ClientVersioningHook;
 import org.briarproject.briar.api.client.MessageTracker;
+import org.briarproject.briar.api.conversation.ConversationMessageHeader;
+import org.briarproject.briar.api.messaging.Attachment;
+import org.briarproject.briar.api.messaging.AttachmentHeader;
 import org.briarproject.briar.api.messaging.MessagingManager;
 import org.briarproject.briar.api.messaging.PrivateMessage;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent;
 import org.briarproject.briar.client.ConversationClientImpl;
 
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
+import java.util.Random;
 
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
+import static java.util.Collections.emptyList;
+import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_BODY_LENGTH;
 import static org.briarproject.briar.client.MessageTrackerConstants.MSG_KEY_READ;
 
 @Immutable
@@ -113,11 +120,12 @@ class MessagingManagerImpl extends ConversationClientImpl
 		long timestamp = meta.getLong("timestamp");
 		boolean local = meta.getBoolean("local");
 		boolean read = meta.getBoolean(MSG_KEY_READ);
-		PrivateMessageHeader header = new PrivateMessageHeader(
-				m.getId(), groupId, timestamp, local, read, false, false);
+		PrivateMessageHeader header =
+				new PrivateMessageHeader(m.getId(), groupId, timestamp, local,
+						read, false, false, emptyList());
 		ContactId contactId = getContactId(txn, groupId);
-		PrivateMessageReceivedEvent<PrivateMessageHeader> event =
-				new PrivateMessageReceivedEvent<>(header, contactId);
+		PrivateMessageReceivedEvent event =
+				new PrivateMessageReceivedEvent(header, contactId);
 		txn.attach(event);
 		messageTracker.trackIncomingMessage(txn, m);
 
@@ -143,6 +151,15 @@ class MessagingManagerImpl extends ConversationClientImpl
 		}
 	}
 
+	@Override
+	public AttachmentHeader addLocalAttachment(GroupId groupId, long timestamp,
+			String contentType, ByteBuffer data) {
+		// TODO add real implementation
+		byte[] b = new byte[MessageId.LENGTH];
+		new Random().nextBytes(b);
+		return new AttachmentHeader(new MessageId(b), "image/png");
+	}
+
 	private ContactId getContactId(Transaction txn, GroupId g)
 			throws DbException {
 		try {
@@ -178,8 +195,8 @@ class MessagingManagerImpl extends ConversationClientImpl
 	}
 
 	@Override
-	public Collection<PrivateMessageHeader> getMessageHeaders(Transaction txn,
-			ContactId c) throws DbException {
+	public Collection<ConversationMessageHeader> getMessageHeaders(
+			Transaction txn, ContactId c) throws DbException {
 		Map<MessageId, BdfDictionary> metadata;
 		Collection<MessageStatus> statuses;
 		GroupId g;
@@ -190,7 +207,7 @@ class MessagingManagerImpl extends ConversationClientImpl
 		} catch (FormatException e) {
 			throw new DbException(e);
 		}
-		Collection<PrivateMessageHeader> headers = new ArrayList<>();
+		Collection<ConversationMessageHeader> headers = new ArrayList<>();
 		for (MessageStatus s : statuses) {
 			MessageId id = s.getMessageId();
 			BdfDictionary meta = metadata.get(id);
@@ -200,7 +217,7 @@ class MessagingManagerImpl extends ConversationClientImpl
 				boolean local = meta.getBoolean("local");
 				boolean read = meta.getBoolean("read");
 				headers.add(new PrivateMessageHeader(id, g, timestamp, local,
-						read, s.isSent(), s.isSeen()));
+						read, s.isSent(), s.isSeen(), emptyList()));
 			} catch (FormatException e) {
 				throw new DbException(e);
 			}
@@ -218,4 +235,13 @@ class MessagingManagerImpl extends ConversationClientImpl
 		}
 	}
 
+	@Override
+	public Attachment getAttachment(MessageId m) {
+		// TODO add real implementation
+		// TODO return actual random/fake image before real implementation is done
+		byte[] b = new byte[MAX_MESSAGE_BODY_LENGTH];
+		new Random().nextBytes(b);
+		return new Attachment(ByteBuffer.wrap(b));
+	}
+
 }

briar-core/src/main/java/org/briarproject/briar/messaging/MessagingModule.java

@@ -7,7 +7,7 @@ import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.sync.ValidationManager;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.versioning.ClientVersioningManager;
-import org.briarproject.briar.api.messaging.ConversationManager;
+import org.briarproject.briar.api.conversation.ConversationManager;
 import org.briarproject.briar.api.messaging.MessagingManager;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
 

briar-core/src/main/java/org/briarproject/briar/messaging/PrivateMessageFactoryImpl.java

@@ -6,9 +6,12 @@ import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
+import org.briarproject.briar.api.messaging.AttachmentHeader;
 import org.briarproject.briar.api.messaging.PrivateMessage;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
 
+import java.util.List;
+
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
@@ -28,7 +31,8 @@ class PrivateMessageFactoryImpl implements PrivateMessageFactory {
 
 	@Override
 	public PrivateMessage createPrivateMessage(GroupId groupId, long timestamp,
-			String text) throws FormatException {
+			String text, List<AttachmentHeader> attachments)
+			throws FormatException {
 		// Validate the arguments
 		if (utf8IsTooLong(text, MAX_PRIVATE_MESSAGE_TEXT_LENGTH))
 			throw new IllegalArgumentException();

briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImpl.java

@@ -26,7 +26,7 @@ import org.briarproject.bramble.api.versioning.ClientVersioningManager;
 import org.briarproject.bramble.api.versioning.ClientVersioningManager.ClientVersioningHook;
 import org.briarproject.briar.api.client.MessageTracker;
 import org.briarproject.briar.api.client.SessionId;
-import org.briarproject.briar.api.messaging.PrivateMessageHeader;
+import org.briarproject.briar.api.conversation.ConversationMessageHeader;
 import org.briarproject.briar.api.privategroup.PrivateGroup;
 import org.briarproject.briar.api.privategroup.PrivateGroupFactory;
 import org.briarproject.briar.api.privategroup.PrivateGroupManager;
@@ -368,7 +368,7 @@ class GroupInvitationManagerImpl extends ConversationClientImpl
 	}
 
 	@Override
-	public Collection<PrivateMessageHeader> getMessageHeaders(Transaction txn,
+	public Collection<ConversationMessageHeader> getMessageHeaders(Transaction txn,
 			ContactId c) throws DbException {
 		try {
 			Contact contact = db.getContact(txn, c);
@@ -376,7 +376,7 @@ class GroupInvitationManagerImpl extends ConversationClientImpl
 			BdfDictionary query = messageParser.getMessagesVisibleInUiQuery();
 			Map<MessageId, BdfDictionary> results = clientHelper
 					.getMessageMetadataAsDictionary(txn, contactGroupId, query);
-			List<PrivateMessageHeader> messages =
+			List<ConversationMessageHeader> messages =
 					new ArrayList<>(results.size());
 			for (Entry<MessageId, BdfDictionary> e : results.entrySet()) {
 				MessageId m = e.getKey();

briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/GroupInvitationModule.java

@@ -7,7 +7,7 @@ import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.sync.ValidationManager;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.versioning.ClientVersioningManager;
-import org.briarproject.briar.api.messaging.ConversationManager;
+import org.briarproject.briar.api.conversation.ConversationManager;
 import org.briarproject.briar.api.privategroup.PrivateGroupFactory;
 import org.briarproject.briar.api.privategroup.PrivateGroupManager;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationFactory;

briar-core/src/main/java/org/briarproject/briar/sharing/BlogProtocolEngineImpl.java

@@ -18,7 +18,7 @@ import org.briarproject.briar.api.blog.BlogManager;
 import org.briarproject.briar.api.blog.event.BlogInvitationRequestReceivedEvent;
 import org.briarproject.briar.api.blog.event.BlogInvitationResponseReceivedEvent;
 import org.briarproject.briar.api.client.MessageTracker;
-import org.briarproject.briar.api.messaging.PrivateRequest;
+import org.briarproject.briar.api.conversation.ConversationRequest;
 
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
@@ -50,7 +50,7 @@ class BlogProtocolEngineImpl extends ProtocolEngineImpl<Blog> {
 	@Override
 	Event getInvitationRequestReceivedEvent(InviteMessage<Blog> m,
 			ContactId contactId, boolean available, boolean canBeOpened) {
-		PrivateRequest<Blog> request = invitationFactory
+		ConversationRequest<Blog> request = invitationFactory
 				.createInvitationRequest(false, false, true, false, m,
 						contactId, available, canBeOpened);
 		return new BlogInvitationRequestReceivedEvent(request, contactId);

briar-core/src/main/java/org/briarproject/briar/sharing/ForumProtocolEngineImpl.java

@@ -18,7 +18,7 @@ import org.briarproject.briar.api.forum.ForumInvitationResponse;
 import org.briarproject.briar.api.forum.ForumManager;
 import org.briarproject.briar.api.forum.event.ForumInvitationRequestReceivedEvent;
 import org.briarproject.briar.api.forum.event.ForumInvitationResponseReceivedEvent;
-import org.briarproject.briar.api.messaging.PrivateRequest;
+import org.briarproject.briar.api.conversation.ConversationRequest;
 
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
@@ -51,7 +51,7 @@ class ForumProtocolEngineImpl extends ProtocolEngineImpl<Forum> {
 	@Override
 	Event getInvitationRequestReceivedEvent(InviteMessage<Forum> m,
 			ContactId contactId, boolean available, boolean canBeOpened) {
-		PrivateRequest<Forum> request = invitationFactory
+		ConversationRequest<Forum> request = invitationFactory
 				.createInvitationRequest(false, false, true, false, m,
 						contactId, available, canBeOpened);
 		return new ForumInvitationRequestReceivedEvent(request, contactId);

briar-core/src/main/java/org/briarproject/briar/sharing/InvitationFactory.java

@@ -3,13 +3,13 @@ package org.briarproject.briar.sharing;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.briar.api.messaging.PrivateRequest;
+import org.briarproject.briar.api.conversation.ConversationRequest;
 import org.briarproject.briar.api.sharing.InvitationResponse;
 import org.briarproject.briar.api.sharing.Shareable;
 
 public interface InvitationFactory<S extends Shareable, R extends InvitationResponse> {
 
-	PrivateRequest<S> createInvitationRequest(boolean local, boolean sent,
+	ConversationRequest<S> createInvitationRequest(boolean local, boolean sent,
 			boolean seen, boolean read, InviteMessage<S> m, ContactId c,
 			boolean available, boolean canBeOpened);
 

briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java

@@ -26,8 +26,8 @@ import org.briarproject.bramble.api.versioning.ClientVersioningManager;
 import org.briarproject.bramble.api.versioning.ClientVersioningManager.ClientVersioningHook;
 import org.briarproject.briar.api.client.MessageTracker;
 import org.briarproject.briar.api.client.SessionId;
-import org.briarproject.briar.api.messaging.PrivateMessageHeader;
-import org.briarproject.briar.api.messaging.PrivateRequest;
+import org.briarproject.briar.api.conversation.ConversationMessageHeader;
+import org.briarproject.briar.api.conversation.ConversationRequest;
 import org.briarproject.briar.api.sharing.InvitationResponse;
 import org.briarproject.briar.api.sharing.Shareable;
 import org.briarproject.briar.api.sharing.SharingInvitationItem;
@@ -321,15 +321,15 @@ abstract class SharingManagerImpl<S extends Shareable>
 	}
 
 	@Override
-	public Collection<PrivateMessageHeader> getMessageHeaders(Transaction txn,
-			ContactId c) throws DbException {
+	public Collection<ConversationMessageHeader> getMessageHeaders(
+			Transaction txn, ContactId c) throws DbException {
 		try {
 			Contact contact = db.getContact(txn, c);
 			GroupId contactGroupId = getContactGroup(contact).getId();
 			BdfDictionary query = messageParser.getMessagesVisibleInUiQuery();
 			Map<MessageId, BdfDictionary> results = clientHelper
 					.getMessageMetadataAsDictionary(txn, contactGroupId, query);
-			Collection<PrivateMessageHeader> messages =
+			Collection<ConversationMessageHeader> messages =
 					new ArrayList<>(results.size());
 			for (Entry<MessageId, BdfDictionary> e : results.entrySet()) {
 				MessageId m = e.getKey();
@@ -354,7 +354,7 @@ abstract class SharingManagerImpl<S extends Shareable>
 		}
 	}
 
-	private PrivateRequest<S> parseInvitationRequest(Transaction txn,
+	private ConversationRequest<S> parseInvitationRequest(Transaction txn,
 			ContactId c, MessageId m, MessageMetadata meta,
 			MessageStatus status) throws DbException, FormatException {
 		// Look up the invite message to get the details of the private group

briar-core/src/main/java/org/briarproject/briar/sharing/SharingModule.java

@@ -17,7 +17,7 @@ import org.briarproject.briar.api.forum.ForumFactory;
 import org.briarproject.briar.api.forum.ForumInvitationResponse;
 import org.briarproject.briar.api.forum.ForumManager;
 import org.briarproject.briar.api.forum.ForumSharingManager;
-import org.briarproject.briar.api.messaging.ConversationManager;
+import org.briarproject.briar.api.conversation.ConversationManager;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java

@@ -53,6 +53,7 @@ import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
+import static java.util.Collections.emptyList;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.UUID_BYTES;
@@ -327,7 +328,7 @@ public class TestDataCreatorImpl implements TestDataCreator {
 	private void createPrivateMessage(GroupId groupId, String text,
 			long timestamp, boolean local) throws DbException, FormatException {
 		PrivateMessage m = privateMessageFactory
-				.createPrivateMessage(groupId, timestamp, text);
+				.createPrivateMessage(groupId, timestamp, text, emptyList());
 		BdfDictionary meta = new BdfDictionary();
 		meta.put("timestamp", timestamp);
 		meta.put("local", local);

briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java

@@ -24,6 +24,7 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.test.TestDatabaseModule;
 import org.briarproject.briar.api.client.ProtocolStateException;
 import org.briarproject.briar.api.client.SessionId;
+import org.briarproject.briar.api.conversation.ConversationMessageHeader;
 import org.briarproject.briar.api.introduction.IntroductionManager;
 import org.briarproject.briar.api.introduction.IntroductionRequest;
 import org.briarproject.briar.api.introduction.IntroductionResponse;
@@ -297,7 +298,7 @@ public class IntroductionIntegrationTest
 
 		Group g1 = introductionManager0.getContactGroup(introducee1);
 		Group g2 = introductionManager0.getContactGroup(introducee2);
-		Collection<PrivateMessageHeader> messages =
+		Collection<ConversationMessageHeader> messages =
 				db0.transactionWithResult(true, txn -> introductionManager0
 						.getMessageHeaders(txn, contactId1From0));
 		assertEquals(2, messages.size());
@@ -363,7 +364,7 @@ public class IntroductionIntegrationTest
 		assertFalse(contactManager2
 				.contactExists(author1.getId(), author2.getId()));
 
-		Collection<PrivateMessageHeader> messages =
+		Collection<ConversationMessageHeader> messages =
 				db0.transactionWithResult(true, txn -> introductionManager0
 						.getMessageHeaders(txn, contactId1From0));
 		assertEquals(2, messages.size());
@@ -1102,31 +1103,31 @@ public class IntroductionIntegrationTest
 	}
 
 	private void assertDefaultUiMessages() throws DbException {
-		Collection<PrivateMessageHeader> messages =
+		Collection<ConversationMessageHeader> messages =
 				db0.transactionWithResult(true, txn -> introductionManager0
 						.getMessageHeaders(txn, contactId1From0));
 		assertEquals(2, messages.size());
 		assertMessagesAreAcked(messages);
 
-		messages = db0.transactionWithResult(true,
-				txn -> introductionManager0.getMessageHeaders(txn, contactId2From0));
+		messages = db0.transactionWithResult(true, txn -> introductionManager0
+				.getMessageHeaders(txn, contactId2From0));
 		assertEquals(2, messages.size());
 		assertMessagesAreAcked(messages);
 
-		messages = db1.transactionWithResult(true,
-				txn -> introductionManager1.getMessageHeaders(txn, contactId0From1));
+		messages = db1.transactionWithResult(true, txn -> introductionManager1
+				.getMessageHeaders(txn, contactId0From1));
 		assertEquals(2, messages.size());
 		assertMessagesAreAcked(messages);
 
-		messages = db2.transactionWithResult(true,
-				txn -> introductionManager2.getMessageHeaders(txn, contactId0From2));
+		messages = db2.transactionWithResult(true, txn -> introductionManager2
+				.getMessageHeaders(txn, contactId0From2));
 		assertEquals(2, messages.size());
 		assertMessagesAreAcked(messages);
 	}
 
 	private void assertMessagesAreAcked(
-			Collection<PrivateMessageHeader> messages) {
-		for (PrivateMessageHeader msg : messages) {
+			Collection<ConversationMessageHeader> messages) {
+		for (ConversationMessageHeader msg : messages) {
 			if (msg.isLocal()) assertTrue(msg.isSeen());
 		}
 	}
@@ -1302,9 +1303,9 @@ public class IntroductionIntegrationTest
 	private IntroductionRequest getIntroductionRequest(DatabaseComponent db,
 			IntroductionManager manager, ContactId contactId)
 			throws DbException {
-		Collection<PrivateMessageHeader> messages = db.transactionWithResult(
+		Collection<ConversationMessageHeader> messages = db.transactionWithResult(
 				true, txn -> manager.getMessageHeaders(txn, contactId));
-		for (PrivateMessageHeader im : messages) {
+		for (ConversationMessageHeader im : messages) {
 			if (im instanceof IntroductionRequest) {
 				return (IntroductionRequest) im;
 			}

briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java

@@ -24,6 +24,7 @@ import org.junit.Test;
 
 import javax.inject.Inject;
 
+import static java.util.Collections.emptyList;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
 import static org.briarproject.bramble.api.record.Record.MAX_RECORD_PAYLOAD_BYTES;
@@ -58,7 +59,7 @@ public class MessageSizeIntegrationTest extends BriarTestCase {
 		long timestamp = Long.MAX_VALUE;
 		String text = getRandomString(MAX_PRIVATE_MESSAGE_TEXT_LENGTH);
 		PrivateMessage message = privateMessageFactory.createPrivateMessage(
-				groupId, timestamp, text);
+				groupId, timestamp, text, emptyList());
 		// Check the size of the serialised message
 		int length = message.getMessage().getRawLength();
 		assertTrue(length > UniqueId.LENGTH + 8

briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTest.java

@@ -41,6 +41,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.InputStream;
 
+import static java.util.Collections.emptyList;
 import static org.briarproject.bramble.api.transport.TransportConstants.TAG_LENGTH;
 import static org.briarproject.bramble.test.TestPluginConfigModule.MAX_LATENCY;
 import static org.briarproject.bramble.test.TestPluginConfigModule.TRANSPORT_ID;
@@ -121,7 +122,7 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
 		PrivateMessageFactory privateMessageFactory =
 				device.getPrivateMessageFactory();
 		PrivateMessage message = privateMessageFactory.createPrivateMessage(
-				groupId, System.currentTimeMillis(), "Hi!");
+				groupId, System.currentTimeMillis(), "Hi!", emptyList());
 		messagingManager.addLocalMessage(message);
 	}
 

briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationIntegrationTest.java

@@ -4,6 +4,7 @@ import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.test.TestDatabaseModule;
 import org.briarproject.briar.api.client.ProtocolStateException;
+import org.briarproject.briar.api.conversation.ConversationMessageHeader;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.privategroup.GroupMessage;
 import org.briarproject.briar.api.privategroup.PrivateGroup;
@@ -91,7 +92,7 @@ public class GroupInvitationIntegrationTest
 		assertEquals(privateGroup0.getName(), item.getName());
 		assertFalse(item.isSubscribed());
 
-		Collection<PrivateMessageHeader> messages =
+		Collection<ConversationMessageHeader> messages =
 				db1.transactionWithResult(true, txn -> groupInvitationManager1
 						.getMessageHeaders(txn, contactId0From1));
 		assertEquals(1, messages.size());
@@ -118,12 +119,12 @@ public class GroupInvitationIntegrationTest
 		groupInvitationManager1
 				.respondToInvitation(contactId0From1, privateGroup0, false);
 
-		Collection<PrivateMessageHeader> messages =
+		Collection<ConversationMessageHeader> messages =
 				db1.transactionWithResult(true, txn -> groupInvitationManager1
 						.getMessageHeaders(txn, contactId0From1));
 		assertEquals(2, messages.size());
 		boolean foundResponse = false;
-		for (PrivateMessageHeader m : messages) {
+		for (ConversationMessageHeader m : messages) {
 			if (m instanceof GroupInvitationResponse) {
 				foundResponse = true;
 				GroupInvitationResponse response = (GroupInvitationResponse) m;
@@ -140,7 +141,7 @@ public class GroupInvitationIntegrationTest
 				.getMessageHeaders(txn, contactId1From0));
 		assertEquals(2, messages.size());
 		foundResponse = false;
-		for (PrivateMessageHeader m : messages) {
+		for (ConversationMessageHeader m : messages) {
 			if (m instanceof GroupInvitationResponse) {
 				foundResponse = true;
 				GroupInvitationResponse response = (GroupInvitationResponse) m;
@@ -168,12 +169,12 @@ public class GroupInvitationIntegrationTest
 		groupInvitationManager1
 				.respondToInvitation(contactId0From1, privateGroup0, true);
 
-		Collection<PrivateMessageHeader> messages =
+		Collection<ConversationMessageHeader> messages =
 				db1.transactionWithResult(true, txn -> groupInvitationManager1
 						.getMessageHeaders(txn, contactId0From1));
 		assertEquals(2, messages.size());
 		boolean foundResponse = false;
-		for (PrivateMessageHeader m : messages) {
+		for (ConversationMessageHeader m : messages) {
 			if (m instanceof GroupInvitationResponse) {
 				foundResponse = true;
 				GroupInvitationResponse response = (GroupInvitationResponse) m;
@@ -194,7 +195,7 @@ public class GroupInvitationIntegrationTest
 				.getMessageHeaders(txn, contactId1From0));
 		assertEquals(2, messages.size());
 		foundResponse = false;
-		for (PrivateMessageHeader m : messages) {
+		for (ConversationMessageHeader m : messages) {
 			if (m instanceof GroupInvitationResponse) {
 				foundResponse = true;
 				GroupInvitationResponse response = (GroupInvitationResponse) m;
@@ -226,9 +227,10 @@ public class GroupInvitationIntegrationTest
 		// 1 has one unread message
 		Group g0 = groupInvitationManager1.getContactGroup(contact0From1);
 		assertGroupCount(messageTracker1, g0.getId(), 1, 1, timestamp);
-		PrivateMessageHeader m = db1.transactionWithResult(true,
-				txn -> groupInvitationManager1.getMessageHeaders(txn, contactId0From1)
-						.iterator().next());
+		ConversationMessageHeader m = db1.transactionWithResult(true,
+				txn -> groupInvitationManager1
+						.getMessageHeaders(txn, contactId0From1).iterator()
+						.next());
 
 		groupInvitationManager1
 				.respondToInvitation(contactId0From1, privateGroup0, true);

briar-core/src/test/java/org/briarproject/briar/privategroup/invitation/GroupInvitationManagerImplTest.java

@@ -24,7 +24,7 @@ import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.TestUtils;
 import org.briarproject.briar.api.client.MessageTracker;
 import org.briarproject.briar.api.client.SessionId;
-import org.briarproject.briar.api.messaging.PrivateMessageHeader;
+import org.briarproject.briar.api.conversation.ConversationMessageHeader;
 import org.briarproject.briar.api.privategroup.PrivateGroup;
 import org.briarproject.briar.api.privategroup.PrivateGroupFactory;
 import org.briarproject.briar.api.privategroup.PrivateGroupManager;
@@ -696,10 +696,10 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).getMessageStatus(txn, contactId, messageId2);
 		}});
 
-		Collection<PrivateMessageHeader> messages =
+		Collection<ConversationMessageHeader> messages =
 				groupInvitationManager.getMessageHeaders(txn, contactId);
 		assertEquals(2, messages.size());
-		for (PrivateMessageHeader m : messages) {
+		for (ConversationMessageHeader m : messages) {
 			assertEquals(contactGroup.getId(), m.getGroupId());
 			if (m.getId().equals(message.getId())) {
 				assertTrue(m instanceof GroupInvitationRequest);

briar-core/src/test/java/org/briarproject/briar/sharing/BlogSharingIntegrationTest.java

@@ -18,7 +18,7 @@ import org.briarproject.briar.api.blog.BlogManager;
 import org.briarproject.briar.api.blog.BlogSharingManager;
 import org.briarproject.briar.api.blog.event.BlogInvitationRequestReceivedEvent;
 import org.briarproject.briar.api.blog.event.BlogInvitationResponseReceivedEvent;
-import org.briarproject.briar.api.messaging.PrivateMessageHeader;
+import org.briarproject.briar.api.conversation.ConversationMessageHeader;
 import org.briarproject.briar.test.BriarIntegrationTest;
 import org.briarproject.briar.test.BriarIntegrationTestComponent;
 import org.briarproject.briar.test.DaggerBriarIntegrationTestComponent;
@@ -146,12 +146,12 @@ public class BlogSharingIntegrationTest
 		assertTrue(blogManager1.getBlogs().contains(blog2));
 
 		// invitee has one invitation message from sharer
-		Collection<PrivateMessageHeader> list = db1.transactionWithResult(true,
-				txn -> blogSharingManager1
+		Collection<ConversationMessageHeader> list =
+				db1.transactionWithResult(true, txn -> blogSharingManager1
 						.getMessageHeaders(txn, contactId0From1));
 		assertEquals(2, list.size());
 		// check other things are alright with the message
-		for (PrivateMessageHeader m : list) {
+		for (ConversationMessageHeader m : list) {
 			if (m instanceof BlogInvitationRequest) {
 				BlogInvitationRequest invitation = (BlogInvitationRequest) m;
 				assertEquals(blog2, invitation.getNameable());
@@ -220,11 +220,12 @@ public class BlogSharingIntegrationTest
 		assertTrue(blogManager1.getBlogs().contains(rssBlog));
 
 		// invitee has one invitation message from sharer
-		Collection<PrivateMessageHeader> list = db1.transactionWithResult(true,
-				txn -> blogSharingManager1.getMessageHeaders(txn, contactId0From1));
+		Collection<ConversationMessageHeader> list =
+				db1.transactionWithResult(true, txn -> blogSharingManager1
+						.getMessageHeaders(txn, contactId0From1));
 		assertEquals(2, list.size());
 		// check other things are alright with the message
-		for (PrivateMessageHeader m : list) {
+		for (ConversationMessageHeader m : list) {
 			if (m instanceof BlogInvitationRequest) {
 				BlogInvitationRequest invitation = (BlogInvitationRequest) m;
 				assertEquals(rssBlog, invitation.getNameable());
@@ -282,11 +283,12 @@ public class BlogSharingIntegrationTest
 		assertEquals(0, blogSharingManager1.getInvitations().size());
 
 		// invitee has one invitation message from sharer and one response
-		Collection<PrivateMessageHeader> list = db1.transactionWithResult(true,
-				txn -> blogSharingManager1.getMessageHeaders(txn, contactId0From1));
+		Collection<ConversationMessageHeader> list =
+				db1.transactionWithResult(true, txn -> blogSharingManager1
+						.getMessageHeaders(txn, contactId0From1));
 		assertEquals(2, list.size());
 		// check things are alright with the  message
-		for (PrivateMessageHeader m : list) {
+		for (ConversationMessageHeader m : list) {
 			if (m instanceof BlogInvitationRequest) {
 				BlogInvitationRequest invitation = (BlogInvitationRequest) m;
 				assertEquals(blog2, invitation.getNameable());
@@ -389,7 +391,7 @@ public class BlogSharingIntegrationTest
 		assertTrue(contacts.contains(contact0From1));
 
 		// make sure 1 knows that they have blog2 already
-		Collection<PrivateMessageHeader> messages =
+		Collection<ConversationMessageHeader> messages =
 				db1.transactionWithResult(true, txn -> blogSharingManager1
 						.getMessageHeaders(txn, contactId0From1));
 		assertEquals(2, messages.size());

briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java

@@ -12,6 +12,7 @@ import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.test.TestDatabaseModule;
+import org.briarproject.briar.api.conversation.ConversationMessageHeader;
 import org.briarproject.briar.api.forum.Forum;
 import org.briarproject.briar.api.forum.ForumInvitationRequest;
 import org.briarproject.briar.api.forum.ForumInvitationResponse;
@@ -129,11 +130,12 @@ public class ForumSharingIntegrationTest
 		assertEquals(1, forumManager1.getForums().size());
 
 		// invitee has one invitation message from sharer
-		Collection<PrivateMessageHeader> list = db1.transactionWithResult(true,
-				txn -> forumSharingManager1.getMessageHeaders(txn, contactId0From1));
+		Collection<ConversationMessageHeader> list =
+				db1.transactionWithResult(true, txn -> forumSharingManager1
+						.getMessageHeaders(txn, contactId0From1));
 		assertEquals(2, list.size());
 		// check other things are alright with the forum message
-		for (PrivateMessageHeader m : list) {
+		for (ConversationMessageHeader m : list) {
 			if (m instanceof ForumInvitationRequest) {
 				ForumInvitationRequest invitation = (ForumInvitationRequest) m;
 				assertTrue(invitation.wasAnswered());
@@ -185,11 +187,12 @@ public class ForumSharingIntegrationTest
 		assertEquals(0, forumSharingManager1.getInvitations().size());
 
 		// invitee has one invitation message from sharer and one response
-		Collection<PrivateMessageHeader> list = db1.transactionWithResult(true,
-				txn -> forumSharingManager1.getMessageHeaders(txn, contactId0From1));
+		Collection<ConversationMessageHeader> list =
+				db1.transactionWithResult(true, txn -> forumSharingManager1
+						.getMessageHeaders(txn, contactId0From1));
 		assertEquals(2, list.size());
 		// check things are alright with the forum message
-		for (PrivateMessageHeader m : list) {
+		for (ConversationMessageHeader m : list) {
 			if (m instanceof ForumInvitationRequest) {
 				ForumInvitationRequest invitation = (ForumInvitationRequest) m;
 				assertEquals(forum0, invitation.getNameable());
@@ -733,9 +736,9 @@ public class ForumSharingIntegrationTest
 
 		// get invitation MessageId for later
 		MessageId invitationId = null;
-		Collection<PrivateMessageHeader> list = db1.transactionWithResult(true,
+		Collection<ConversationMessageHeader> list = db1.transactionWithResult(true,
 				txn -> forumSharingManager1.getMessageHeaders(txn, contactId0From1));
-		for (PrivateMessageHeader m : list) {
+		for (ConversationMessageHeader m : list) {
 			if (m instanceof ForumInvitationRequest) {
 				invitationId = m.getId();
 			}