Unify all private message requests in one PrivateRequest class

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

@@ -26,6 +26,7 @@ import org.briarproject.bramble.api.transport.KeySetId;
 import org.briarproject.briar.api.client.MessageTracker;
 import org.briarproject.briar.api.client.ProtocolStateException;
 import org.briarproject.briar.api.client.SessionId;
+import org.briarproject.briar.api.introduction.Introduction;
 import org.briarproject.briar.api.introduction.IntroductionRequest;
 import org.briarproject.briar.api.introduction.event.IntroductionAbortedEvent;
 import org.briarproject.briar.api.introduction.event.IntroductionRequestReceivedEvent;
@@ -254,9 +255,11 @@ class IntroduceeProtocolEngine
 				localAuthor.getId());
 		boolean contactExists = contactManager
 				.contactExists(txn, m.getAuthor().getId(), localAuthor.getId());
-		IntroductionRequest request = new IntroductionRequest(s.getSessionId(),
-				m.getMessageId(), m.getGroupId(), m.getTimestamp(), false,
-				false, false, false, m.getAuthor(), m.getMessage(), false,
+		Introduction introduction =
+				new Introduction(m.getAuthor(), s.getRole());
+		IntroductionRequest request = new IntroductionRequest(m.getMessageId(),
+				m.getGroupId(), m.getTimestamp(), false, false, false, false,
+				s.getSessionId(), introduction, m.getMessage(), false,
 				contactExists);
 		IntroductionRequestReceivedEvent e =
 				new IntroductionRequestReceivedEvent(c.getId(), request);

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

@@ -29,11 +29,12 @@ 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.introduction.Introduction;
 import org.briarproject.briar.api.introduction.IntroductionManager;
-import org.briarproject.briar.api.introduction.IntroductionMessage;
 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;
 
@@ -398,9 +399,9 @@ class IntroductionManagerImpl extends ConversationClientImpl
 	}
 
 	@Override
-	public Collection<IntroductionMessage> getIntroductionMessages(ContactId c)
+	public Collection<PrivateMessageHeader> getIntroductionMessages(ContactId c)
 			throws DbException {
-		List<IntroductionMessage> messages;
+		List<PrivateMessageHeader> messages;
 		Transaction txn = db.startTransaction(true);
 		try {
 			Contact contact = db.getContact(txn, c);
@@ -470,11 +471,11 @@ class IntroductionManagerImpl extends ConversationClientImpl
 		boolean contactExists = contactManager
 				.contactExists(txn, rm.getAuthor().getId(),
 						localAuthor.getId());
-
-		return new IntroductionRequest(sessionId, m, contactGroupId,
-				meta.getTimestamp(), meta.isLocal(), status.isSent(),
-				status.isSeen(), meta.isRead(), author, message,
-				!meta.isAvailableToAnswer(), contactExists);
+		Introduction introduction = new Introduction(author, role);
+		return new IntroductionRequest(m, contactGroupId, meta.getTimestamp(),
+				meta.isLocal(), status.isSent(), status.isSeen(), meta.isRead(),
+				sessionId, introduction, message, !meta.isAvailableToAnswer(),
+				contactExists);
 	}
 
 	private IntroductionResponse parseInvitationResponse(GroupId contactGroupId,

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

@@ -26,6 +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.privategroup.PrivateGroup;
 import org.briarproject.briar.api.privategroup.PrivateGroupFactory;
 import org.briarproject.briar.api.privategroup.PrivateGroupManager;
@@ -34,7 +35,6 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationItem;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse;
-import org.briarproject.briar.api.sharing.InvitationMessage;
 import org.briarproject.briar.client.ConversationClientImpl;
 
 import java.util.ArrayList;
@@ -368,9 +368,9 @@ class GroupInvitationManagerImpl extends ConversationClientImpl
 	}
 
 	@Override
-	public Collection<InvitationMessage> getInvitationMessages(ContactId c)
+	public Collection<PrivateMessageHeader> getInvitationMessages(ContactId c)
 			throws DbException {
-		List<InvitationMessage> messages;
+		List<PrivateMessageHeader> messages;
 		Transaction txn = db.startTransaction(true);
 		try {
 			Contact contact = db.getContact(txn, c);
@@ -422,7 +422,7 @@ class GroupInvitationManagerImpl extends ConversationClientImpl
 				db.containsGroup(txn, invite.getPrivateGroupId());
 		return new GroupInvitationRequest(m, contactGroupId,
 				meta.getTimestamp(), meta.isLocal(), status.isSent(),
-				status.isSeen(), meta.isRead(), sessionId, pg, c,
+				status.isSeen(), meta.isRead(), sessionId, pg,
 				invite.getMessage(), meta.isAvailableToAnswer(), canBeOpened);
 	}
 

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

@@ -331,7 +331,7 @@ class InviteeProtocolEngine extends AbstractProtocolEngine<InviteeSession> {
 			PrivateGroup pg, ContactId c) {
 		SessionId sessionId = new SessionId(m.getPrivateGroupId().getBytes());
 		return new GroupInvitationRequest(m.getId(), m.getContactGroupId(),
-				m.getTimestamp(), false, false, true, false, sessionId, pg, c,
+				m.getTimestamp(), false, false, true, false, sessionId, pg,
 				m.getMessage(), true, false);
 	}
 

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

@@ -24,7 +24,7 @@ public class BlogInvitationFactoryImpl
 		SessionId sessionId = new SessionId(m.getShareableId().getBytes());
 		return new BlogInvitationRequest(m.getId(), m.getContactGroupId(),
 				m.getTimestamp(), local, sent, seen, read, sessionId,
-				m.getShareable(), c, m.getMessage(), available, canBeOpened);
+				m.getShareable(), m.getMessage(), available, canBeOpened);
 	}
 
 	@Override

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.sharing.InvitationRequest;
+import org.briarproject.briar.api.messaging.PrivateRequest;
 
 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) {
-		InvitationRequest<Blog> request = invitationFactory
+		PrivateRequest<Blog> request = invitationFactory
 				.createInvitationRequest(false, false, true, false, m,
 						contactId, available, canBeOpened);
 		return new BlogInvitationRequestReceivedEvent(m.getShareable(),

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

@@ -24,7 +24,7 @@ public class ForumInvitationFactoryImpl
 		SessionId sessionId = new SessionId(m.getShareableId().getBytes());
 		return new ForumInvitationRequest(m.getId(), m.getContactGroupId(),
 				m.getTimestamp(), local, sent, seen, read, sessionId,
-				m.getShareable(), c, m.getMessage(), available, canBeOpened);
+				m.getShareable(), m.getMessage(), available, canBeOpened);
 	}
 
 	@Override

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.sharing.InvitationRequest;
+import org.briarproject.briar.api.messaging.PrivateRequest;
 
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
@@ -52,7 +52,7 @@ class ForumProtocolEngineImpl extends ProtocolEngineImpl<Forum> {
 	@Override
 	Event getInvitationRequestReceivedEvent(InviteMessage<Forum> m,
 			ContactId contactId, boolean available, boolean canBeOpened) {
-		InvitationRequest<Forum> request = invitationFactory
+		PrivateRequest<Forum> request = invitationFactory
 				.createInvitationRequest(false, false, true, false, m,
 						contactId, available, canBeOpened);
 		return new ForumInvitationRequestReceivedEvent(m.getShareable(),

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.sharing.InvitationRequest;
+import org.briarproject.briar.api.messaging.PrivateRequest;
 import org.briarproject.briar.api.sharing.InvitationResponse;
 import org.briarproject.briar.api.sharing.Shareable;
 
 public interface InvitationFactory<S extends Shareable, I extends InvitationResponse> {
 
-	InvitationRequest<S> createInvitationRequest(boolean local, boolean sent,
+	PrivateRequest<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.sharing.InvitationMessage;
-import org.briarproject.briar.api.sharing.InvitationRequest;
+import org.briarproject.briar.api.messaging.PrivateMessageHeader;
+import org.briarproject.briar.api.messaging.PrivateRequest;
 import org.briarproject.briar.api.sharing.InvitationResponse;
 import org.briarproject.briar.api.sharing.Shareable;
 import org.briarproject.briar.api.sharing.SharingInvitationItem;
@@ -321,9 +321,9 @@ abstract class SharingManagerImpl<S extends Shareable>
 	}
 
 	@Override
-	public Collection<InvitationMessage> getInvitationMessages(ContactId c)
+	public Collection<PrivateMessageHeader> getInvitationMessages(ContactId c)
 			throws DbException {
-		List<InvitationMessage> messages;
+		List<PrivateMessageHeader> messages;
 		Transaction txn = db.startTransaction(true);
 		try {
 			Contact contact = db.getContact(txn, c);
@@ -360,7 +360,7 @@ abstract class SharingManagerImpl<S extends Shareable>
 		return messages;
 	}
 
-	private InvitationRequest parseInvitationRequest(Transaction txn,
+	private PrivateRequest 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/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java

@@ -25,13 +25,13 @@ 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.introduction.IntroductionManager;
-import org.briarproject.briar.api.introduction.IntroductionMessage;
 import org.briarproject.briar.api.introduction.IntroductionRequest;
 import org.briarproject.briar.api.introduction.IntroductionResponse;
 import org.briarproject.briar.api.introduction.event.IntroductionAbortedEvent;
 import org.briarproject.briar.api.introduction.event.IntroductionRequestReceivedEvent;
 import org.briarproject.briar.api.introduction.event.IntroductionResponseReceivedEvent;
 import org.briarproject.briar.api.introduction.event.IntroductionSucceededEvent;
+import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.test.BriarIntegrationTest;
 import org.junit.Before;
 import org.junit.Test;
@@ -608,10 +608,10 @@ public class IntroductionIntegrationTest
 		// assert that introducees get notified about the existing contact
 		IntroductionRequest ir1 =
 				getIntroductionRequest(introductionManager1, contactId0From1);
-		assertTrue(ir1.contactExists());
+		assertTrue(ir1.doesExist());
 		IntroductionRequest ir2 =
 				getIntroductionRequest(introductionManager2, contactId0From2);
-		assertTrue(ir2.contactExists());
+		assertTrue(ir2.doesExist());
 
 		// sync ACCEPT messages back to introducer
 		sync1To0(1, true);
@@ -1100,7 +1100,7 @@ public class IntroductionIntegrationTest
 	}
 
 	private void assertDefaultUiMessages() throws DbException {
-		Collection<IntroductionMessage> messages =
+		Collection<PrivateMessageHeader> messages =
 				introductionManager0.getIntroductionMessages(contactId1From0);
 		assertEquals(2, messages.size());
 		assertMessagesAreAcked(messages);
@@ -1122,8 +1122,8 @@ public class IntroductionIntegrationTest
 	}
 
 	private void assertMessagesAreAcked(
-			Collection<IntroductionMessage> messages) {
-		for (IntroductionMessage msg : messages) {
+			Collection<PrivateMessageHeader> messages) {
+		for (PrivateMessageHeader msg : messages) {
 			if (msg.isLocal()) assertTrue(msg.isSeen());
 		}
 	}
@@ -1299,7 +1299,7 @@ public class IntroductionIntegrationTest
 	private IntroductionRequest getIntroductionRequest(
 			IntroductionManager manager, ContactId contactId)
 			throws DbException {
-		for (IntroductionMessage im : manager
+		for (PrivateMessageHeader im : manager
 				.getIntroductionMessages(contactId)) {
 			if (im instanceof IntroductionRequest) {
 				return (IntroductionRequest) im;

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.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.privategroup.GroupMessage;
 import org.briarproject.briar.api.privategroup.PrivateGroup;
 import org.briarproject.briar.api.privategroup.PrivateGroupManager;
@@ -11,7 +12,6 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationItem;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse;
-import org.briarproject.briar.api.sharing.InvitationMessage;
 import org.briarproject.briar.api.sharing.InvitationResponse;
 import org.briarproject.briar.test.BriarIntegrationTest;
 import org.briarproject.briar.test.BriarIntegrationTestComponent;
@@ -92,18 +92,18 @@ public class GroupInvitationIntegrationTest
 		assertEquals(privateGroup0.getName(), item.getName());
 		assertFalse(item.isSubscribed());
 
-		Collection<InvitationMessage> messages =
+		Collection<PrivateMessageHeader> messages =
 				groupInvitationManager1.getInvitationMessages(contactId0From1);
 		assertEquals(1, messages.size());
 		GroupInvitationRequest request =
 				(GroupInvitationRequest) messages.iterator().next();
 		assertEquals(msg, request.getMessage());
-		assertEquals(author0, request.getShareable().getCreator());
+		assertEquals(author0, request.getObject().getCreator());
 		assertEquals(timestamp, request.getTimestamp());
-		assertEquals(privateGroup0.getName(), request.getShareable().getName());
+		assertEquals(privateGroup0.getName(), request.getObject().getName());
 		assertFalse(request.isLocal());
 		assertFalse(request.isRead());
-		assertFalse(request.canBeOpened());
+		assertFalse(request.doesExist());
 	}
 
 	@Test
@@ -117,11 +117,11 @@ public class GroupInvitationIntegrationTest
 		groupInvitationManager1
 				.respondToInvitation(contactId0From1, privateGroup0, false);
 
-		Collection<InvitationMessage> messages =
+		Collection<PrivateMessageHeader> messages =
 				groupInvitationManager1.getInvitationMessages(contactId0From1);
 		assertEquals(2, messages.size());
 		boolean foundResponse = false;
-		for (InvitationMessage m : messages) {
+		for (PrivateMessageHeader m : messages) {
 			if (m instanceof GroupInvitationResponse) {
 				foundResponse = true;
 				InvitationResponse response = (GroupInvitationResponse) m;
@@ -137,7 +137,7 @@ public class GroupInvitationIntegrationTest
 				groupInvitationManager0.getInvitationMessages(contactId1From0);
 		assertEquals(2, messages.size());
 		foundResponse = false;
-		for (InvitationMessage m : messages) {
+		for (PrivateMessageHeader m : messages) {
 			if (m instanceof GroupInvitationResponse) {
 				foundResponse = true;
 				InvitationResponse response = (GroupInvitationResponse) m;
@@ -164,17 +164,17 @@ public class GroupInvitationIntegrationTest
 		groupInvitationManager1
 				.respondToInvitation(contactId0From1, privateGroup0, true);
 
-		Collection<InvitationMessage> messages =
+		Collection<PrivateMessageHeader> messages =
 				groupInvitationManager1.getInvitationMessages(contactId0From1);
 		assertEquals(2, messages.size());
 		boolean foundResponse = false;
-		for (InvitationMessage m : messages) {
+		for (PrivateMessageHeader m : messages) {
 			if (m instanceof GroupInvitationResponse) {
 				foundResponse = true;
 				InvitationResponse response = (GroupInvitationResponse) m;
 				assertTrue(response.wasAccepted());
 			} else {
-				assertTrue(((GroupInvitationRequest) m).canBeOpened());
+				assertTrue(((GroupInvitationRequest) m).doesExist());
 			}
 		}
 		assertTrue(foundResponse);
@@ -185,7 +185,7 @@ public class GroupInvitationIntegrationTest
 				groupInvitationManager0.getInvitationMessages(contactId1From0);
 		assertEquals(2, messages.size());
 		foundResponse = false;
-		for (InvitationMessage m : messages) {
+		for (PrivateMessageHeader m : messages) {
 			if (m instanceof GroupInvitationResponse) {
 				foundResponse = true;
 				InvitationResponse response = (GroupInvitationResponse) m;
@@ -216,7 +216,7 @@ public class GroupInvitationIntegrationTest
 		// 1 has one unread message
 		Group g0 = groupInvitationManager1.getContactGroup(contact0From1);
 		assertGroupCount(messageTracker1, g0.getId(), 1, 1, timestamp);
-		InvitationMessage m =
+		PrivateMessageHeader m =
 				groupInvitationManager1.getInvitationMessages(contactId0From1)
 						.iterator().next();
 

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

@@ -24,13 +24,13 @@ 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.privategroup.PrivateGroup;
 import org.briarproject.briar.api.privategroup.PrivateGroupFactory;
 import org.briarproject.briar.api.privategroup.PrivateGroupManager;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationItem;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse;
-import org.briarproject.briar.api.sharing.InvitationMessage;
 import org.jmock.AbstractExpectations;
 import org.jmock.Expectations;
 import org.jmock.lib.legacy.ClassImposteriser;
@@ -701,10 +701,10 @@ public class GroupInvitationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).endTransaction(txn);
 		}});
 
-		Collection<InvitationMessage> messages =
+		Collection<PrivateMessageHeader> messages =
 				groupInvitationManager.getInvitationMessages(contactId);
 		assertEquals(2, messages.size());
-		for (InvitationMessage m : messages) {
+		for (PrivateMessageHeader 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.sharing.InvitationMessage;
+import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.test.BriarIntegrationTest;
 import org.briarproject.briar.test.BriarIntegrationTestComponent;
 import org.briarproject.briar.test.DaggerBriarIntegrationTestComponent;
@@ -147,17 +147,17 @@ public class BlogSharingIntegrationTest
 		assertTrue(blogManager1.getBlogs().contains(blog2));
 
 		// invitee has one invitation message from sharer
-		List<InvitationMessage> list = new ArrayList<>(
+		List<PrivateMessageHeader> list = new ArrayList<>(
 				blogSharingManager1.getInvitationMessages(contactId0From1));
 		assertEquals(2, list.size());
 		// check other things are alright with the message
-		for (InvitationMessage m : list) {
+		for (PrivateMessageHeader m : list) {
 			if (m instanceof BlogInvitationRequest) {
 				BlogInvitationRequest invitation = (BlogInvitationRequest) m;
-				assertFalse(invitation.isAvailable());
+				assertFalse(invitation.wasAnswered());
 				assertEquals(blog2.getAuthor().getName(),
-						invitation.getBlogAuthorName());
-				assertFalse(invitation.getShareable().isRssFeed());
+						invitation.getName());
+				assertFalse(invitation.getObject().isRssFeed());
 				assertEquals("Hi!", invitation.getMessage());
 			} else {
 				BlogInvitationResponse response = (BlogInvitationResponse) m;
@@ -218,17 +218,17 @@ public class BlogSharingIntegrationTest
 		assertTrue(blogManager1.getBlogs().contains(rssBlog));
 
 		// invitee has one invitation message from sharer
-		List<InvitationMessage> list = new ArrayList<>(
+		List<PrivateMessageHeader> list = new ArrayList<>(
 				blogSharingManager1.getInvitationMessages(contactId0From1));
 		assertEquals(2, list.size());
 		// check other things are alright with the message
-		for (InvitationMessage m : list) {
+		for (PrivateMessageHeader m : list) {
 			if (m instanceof BlogInvitationRequest) {
 				BlogInvitationRequest invitation = (BlogInvitationRequest) m;
-				assertFalse(invitation.isAvailable());
+				assertFalse(invitation.wasAnswered());
 				assertEquals(rssBlog.getAuthor().getName(),
-						invitation.getBlogAuthorName());
-				assertTrue(invitation.getShareable().isRssFeed());
+						invitation.getName());
+				assertTrue(invitation.getObject().isRssFeed());
 				assertEquals("Hi!", invitation.getMessage());
 			} else {
 				BlogInvitationResponse response = (BlogInvitationResponse) m;
@@ -277,16 +277,16 @@ public class BlogSharingIntegrationTest
 		assertEquals(0, blogSharingManager1.getInvitations().size());
 
 		// invitee has one invitation message from sharer and one response
-		List<InvitationMessage> list = new ArrayList<>(
+		List<PrivateMessageHeader> list = new ArrayList<>(
 				blogSharingManager1.getInvitationMessages(contactId0From1));
 		assertEquals(2, list.size());
 		// check things are alright with the  message
-		for (InvitationMessage m : list) {
+		for (PrivateMessageHeader m : list) {
 			if (m instanceof BlogInvitationRequest) {
 				BlogInvitationRequest invitation = (BlogInvitationRequest) m;
-				assertFalse(invitation.isAvailable());
+				assertFalse(invitation.wasAnswered());
 				assertEquals(blog2.getAuthor().getName(),
-						invitation.getBlogAuthorName());
+						invitation.getName());
 				assertEquals(null, invitation.getMessage());
 			} else {
 				BlogInvitationResponse response = (BlogInvitationResponse) m;
@@ -382,7 +382,7 @@ public class BlogSharingIntegrationTest
 		assertTrue(contacts.contains(contact0From1));
 
 		// make sure 1 knows that they have blog2 already
-		Collection<InvitationMessage> messages =
+		Collection<PrivateMessageHeader> messages =
 				blogSharingManager1.getInvitationMessages(contactId0From1);
 		assertEquals(2, messages.size());
 		assertEquals(blog2, blogManager1.getBlog(blog2.getId()));

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

@@ -22,7 +22,7 @@ import org.briarproject.briar.api.forum.ForumPostHeader;
 import org.briarproject.briar.api.forum.ForumSharingManager;
 import org.briarproject.briar.api.forum.event.ForumInvitationRequestReceivedEvent;
 import org.briarproject.briar.api.forum.event.ForumInvitationResponseReceivedEvent;
-import org.briarproject.briar.api.sharing.InvitationMessage;
+import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.sharing.SharingInvitationItem;
 import org.briarproject.briar.test.BriarIntegrationTest;
 import org.briarproject.briar.test.BriarIntegrationTestComponent;
@@ -131,18 +131,18 @@ public class ForumSharingIntegrationTest
 		assertEquals(1, forumManager1.getForums().size());
 
 		// invitee has one invitation message from sharer
-		List<InvitationMessage> list = new ArrayList<>(
+		List<PrivateMessageHeader> list = new ArrayList<>(
 				forumSharingManager1.getInvitationMessages(contactId0From1));
 		assertEquals(2, list.size());
 		// check other things are alright with the forum message
-		for (InvitationMessage m : list) {
+		for (PrivateMessageHeader m : list) {
 			if (m instanceof ForumInvitationRequest) {
 				ForumInvitationRequest invitation =
 						(ForumInvitationRequest) m;
-				assertFalse(invitation.isAvailable());
-				assertEquals(forum0.getName(), invitation.getForumName());
+				assertFalse(invitation.wasAnswered());
+				assertEquals(forum0.getName(), invitation.getName());
 				assertEquals("Hi!", invitation.getMessage());
-				assertTrue(invitation.canBeOpened());
+				assertTrue(invitation.doesExist());
 			} else {
 				ForumInvitationResponse response =
 						(ForumInvitationResponse) m;
@@ -188,17 +188,17 @@ public class ForumSharingIntegrationTest
 		assertEquals(0, forumSharingManager1.getInvitations().size());
 
 		// invitee has one invitation message from sharer and one response
-		List<InvitationMessage> list = new ArrayList<>(
+		List<PrivateMessageHeader> list = new ArrayList<>(
 				forumSharingManager1.getInvitationMessages(contactId0From1));
 		assertEquals(2, list.size());
 		// check things are alright with the forum message
-		for (InvitationMessage m : list) {
+		for (PrivateMessageHeader m : list) {
 			if (m instanceof ForumInvitationRequest) {
 				ForumInvitationRequest invitation = (ForumInvitationRequest) m;
-				assertFalse(invitation.isAvailable());
-				assertEquals(forum0.getName(), invitation.getForumName());
+				assertFalse(invitation.wasAnswered());
+				assertEquals(forum0.getName(), invitation.getName());
 				assertEquals(null, invitation.getMessage());
-				assertFalse(invitation.canBeOpened());
+				assertFalse(invitation.doesExist());
 			} else {
 				ForumInvitationResponse response = (ForumInvitationResponse) m;
 				assertFalse(response.wasAccepted());
@@ -742,7 +742,7 @@ public class ForumSharingIntegrationTest
 
 		// get invitation MessageId for later
 		MessageId invitationId = null;
-		for (InvitationMessage m : forumSharingManager1
+		for (PrivateMessageHeader m : forumSharingManager1
 				.getInvitationMessages(contactId0From1)) {
 			if (m instanceof ForumInvitationRequest) {
 				invitationId = m.getId();