Move ConversationManagerImpl to conversation package.

briar-core/src/main/java/org/briarproject/briar/BriarCoreEagerSingletons.java

@@ -3,6 +3,7 @@ package org.briarproject.briar;
 import org.briarproject.briar.autodelete.AutoDeleteModule;
 import org.briarproject.briar.avatar.AvatarModule;
 import org.briarproject.briar.blog.BlogModule;
+import org.briarproject.briar.conversation.ConversationModule;
 import org.briarproject.briar.feed.FeedModule;
 import org.briarproject.briar.forum.ForumModule;
 import org.briarproject.briar.identity.IdentityModule;
@@ -20,6 +21,8 @@ public interface BriarCoreEagerSingletons {
 
 	void inject(BlogModule.EagerSingletons init);
 
+	void inject(ConversationModule.EagerSingletons init);
+
 	void inject(FeedModule.EagerSingletons init);
 
 	void inject(ForumModule.EagerSingletons init);
@@ -42,6 +45,7 @@ public interface BriarCoreEagerSingletons {
 			c.inject(new AutoDeleteModule.EagerSingletons());
 			c.inject(new AvatarModule.EagerSingletons());
 			c.inject(new BlogModule.EagerSingletons());
+			c.inject(new ConversationModule.EagerSingletons());
 			c.inject(new FeedModule.EagerSingletons());
 			c.inject(new ForumModule.EagerSingletons());
 			c.inject(new GroupInvitationModule.EagerSingletons());

briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java

@@ -5,6 +5,7 @@ import org.briarproject.briar.autodelete.AutoDeleteModule;
 import org.briarproject.briar.avatar.AvatarModule;
 import org.briarproject.briar.blog.BlogModule;
 import org.briarproject.briar.client.BriarClientModule;
+import org.briarproject.briar.conversation.ConversationModule;
 import org.briarproject.briar.feed.DnsModule;
 import org.briarproject.briar.feed.FeedModule;
 import org.briarproject.briar.forum.ForumModule;
@@ -24,8 +25,9 @@ import dagger.Module;
 		AvatarModule.class,
 		BlogModule.class,
 		BriarClientModule.class,
-		FeedModule.class,
+		ConversationModule.class,
 		DnsModule.class,
+		FeedModule.class,
 		ForumModule.class,
 		GroupInvitationModule.class,
 		IdentityModule.class,

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

@@ -1,4 +1,4 @@
-package org.briarproject.briar.messaging;
+package org.briarproject.briar.conversation;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DatabaseComponent;

briar-core/src/main/java/org/briarproject/briar/conversation/ConversationModule.java

@@ -0,0 +1,25 @@
+package org.briarproject.briar.conversation;
+
+import org.briarproject.briar.api.conversation.ConversationManager;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class ConversationModule {
+
+	public static class EagerSingletons {
+		@Inject
+		ConversationManager conversationManager;
+	}
+
+	@Provides
+	@Singleton
+	ConversationManager provideConversationManager(
+			ConversationManagerImpl conversationManager) {
+		return conversationManager;
+	}
+}

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

@@ -28,8 +28,6 @@ public class MessagingModule {
 		@Inject
 		MessagingManager messagingManager;
 		@Inject
-		ConversationManager conversationManager;
-		@Inject
 		PrivateMessageValidator privateMessageValidator;
 	}
 
@@ -67,12 +65,4 @@ public class MessagingModule {
 				MINOR_VERSION, messagingManager);
 		return messagingManager;
 	}
-
-	@Provides
-	@Singleton
-	ConversationManager getConversationManager(
-			ConversationManagerImpl conversationManager) {
-		return conversationManager;
-	}
-
 }

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

@@ -7,6 +7,7 @@ import org.briarproject.briar.autodelete.AutoDeleteModule;
 import org.briarproject.briar.avatar.AvatarModule;
 import org.briarproject.briar.blog.BlogModule;
 import org.briarproject.briar.client.BriarClientModule;
+import org.briarproject.briar.conversation.ConversationModule;
 import org.briarproject.briar.forum.ForumModule;
 import org.briarproject.briar.identity.IdentityModule;
 import org.briarproject.briar.messaging.MessagingModule;
@@ -28,6 +29,7 @@ import dagger.Component;
 		AvatarModule.class,
 		BlogModule.class,
 		BriarClientModule.class,
+		ConversationModule.class,
 		ForumModule.class,
 		GroupInvitationModule.class,
 		IdentityModule.class,

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

@@ -6,6 +6,7 @@ import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule;
 import org.briarproject.briar.autodelete.AutoDeleteModule;
 import org.briarproject.briar.avatar.AvatarModule;
 import org.briarproject.briar.client.BriarClientModule;
+import org.briarproject.briar.conversation.ConversationModule;
 import org.briarproject.briar.forum.ForumModule;
 import org.briarproject.briar.identity.IdentityModule;
 
@@ -20,6 +21,7 @@ import dagger.Component;
 		BriarClientModule.class,
 		AutoDeleteModule.class,
 		AvatarModule.class,
+		ConversationModule.class,
 		ForumModule.class,
 		IdentityModule.class,
 		MessagingModule.class

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

@@ -12,6 +12,7 @@ import org.briarproject.briar.api.messaging.MessagingManager;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
 import org.briarproject.briar.autodelete.AutoDeleteModule;
 import org.briarproject.briar.client.BriarClientModule;
+import org.briarproject.briar.conversation.ConversationModule;
 
 import javax.inject.Singleton;
 
@@ -23,6 +24,7 @@ import dagger.Component;
 		BrambleCoreIntegrationTestModule.class,
 		BrambleCoreModule.class,
 		BriarClientModule.class,
+		ConversationModule.class,
 		MessagingModule.class
 })
 interface SimplexMessagingIntegrationTestComponent

briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java

@@ -34,6 +34,7 @@ import org.briarproject.briar.autodelete.AutoDeleteModule;
 import org.briarproject.briar.avatar.AvatarModule;
 import org.briarproject.briar.blog.BlogModule;
 import org.briarproject.briar.client.BriarClientModule;
+import org.briarproject.briar.conversation.ConversationModule;
 import org.briarproject.briar.forum.ForumModule;
 import org.briarproject.briar.identity.IdentityModule;
 import org.briarproject.briar.introduction.IntroductionModule;
@@ -55,6 +56,7 @@ import dagger.Component;
 		AvatarModule.class,
 		BlogModule.class,
 		BriarClientModule.class,
+		ConversationModule.class,
 		ForumModule.class,
 		GroupInvitationModule.class,
 		IdentityModule.class,
@@ -74,6 +76,8 @@ public interface BriarIntegrationTestComponent
 
 	void inject(BlogModule.EagerSingletons init);
 
+	void inject(ConversationModule.EagerSingletons init);
+
 	void inject(ForumModule.EagerSingletons init);
 
 	void inject(GroupInvitationModule.EagerSingletons init);
@@ -149,6 +153,7 @@ public interface BriarIntegrationTestComponent
 			c.inject(new AutoDeleteModule.EagerSingletons());
 			c.inject(new AvatarModule.EagerSingletons());
 			c.inject(new BlogModule.EagerSingletons());
+			c.inject(new ConversationModule.EagerSingletons());
 			c.inject(new ForumModule.EagerSingletons());
 			c.inject(new GroupInvitationModule.EagerSingletons());
 			c.inject(new IdentityModule.EagerSingletons());

briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt

@@ -13,9 +13,6 @@ import io.mockk.mockkStatic
 import io.mockk.runs
 import org.briarproject.bramble.api.contact.ContactId
 import org.briarproject.bramble.api.db.NoSuchContactException
-import org.briarproject.briar.api.identity.AuthorInfo
-import org.briarproject.briar.api.identity.AuthorInfo.Status.UNVERIFIED
-import org.briarproject.briar.api.identity.AuthorInfo.Status.VERIFIED
 import org.briarproject.bramble.api.sync.MessageId
 import org.briarproject.bramble.api.sync.event.MessagesAckedEvent
 import org.briarproject.bramble.api.sync.event.MessagesSentEvent
@@ -25,6 +22,9 @@ import org.briarproject.bramble.util.StringUtils.getRandomString
 import org.briarproject.briar.api.autodelete.AutoDeleteConstants.NO_AUTO_DELETE_TIMER
 import org.briarproject.briar.api.client.SessionId
 import org.briarproject.briar.api.conversation.DeletionResult
+import org.briarproject.briar.api.identity.AuthorInfo
+import org.briarproject.briar.api.identity.AuthorInfo.Status.UNVERIFIED
+import org.briarproject.briar.api.identity.AuthorInfo.Status.VERIFIED
 import org.briarproject.briar.api.introduction.IntroductionRequest
 import org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_TEXT_LENGTH
 import org.briarproject.briar.api.messaging.MessagingManager