From c89bde08db7c0c8576d8fbb94946c6bbfe848ff3 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 25 Feb 2021 16:00:49 +0000 Subject: [PATCH] Move ConversationManagerImpl to conversation package. --- .../briar/BriarCoreEagerSingletons.java | 4 +++ .../briarproject/briar/BriarCoreModule.java | 4 ++- .../ConversationManagerImpl.java | 2 +- .../conversation/ConversationModule.java | 25 +++++++++++++++++++ .../briar/messaging/MessagingModule.java | 10 -------- .../IntroductionIntegrationTestComponent.java | 2 ++ .../MessageSizeIntegrationTestComponent.java | 2 ++ ...plexMessagingIntegrationTestComponent.java | 2 ++ .../test/BriarIntegrationTestComponent.java | 5 ++++ .../messaging/MessagingControllerImplTest.kt | 6 ++--- 10 files changed, 47 insertions(+), 15 deletions(-) rename briar-core/src/main/java/org/briarproject/briar/{messaging => conversation}/ConversationManagerImpl.java (98%) create mode 100644 briar-core/src/main/java/org/briarproject/briar/conversation/ConversationModule.java diff --git a/briar-core/src/main/java/org/briarproject/briar/BriarCoreEagerSingletons.java b/briar-core/src/main/java/org/briarproject/briar/BriarCoreEagerSingletons.java index cffe834fa..9ca109ee4 100644 --- a/briar-core/src/main/java/org/briarproject/briar/BriarCoreEagerSingletons.java +++ b/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()); diff --git a/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java b/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java index 65d8a3c9a..9211d9201 100644 --- a/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java +++ b/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, diff --git a/briar-core/src/main/java/org/briarproject/briar/messaging/ConversationManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/conversation/ConversationManagerImpl.java similarity index 98% rename from briar-core/src/main/java/org/briarproject/briar/messaging/ConversationManagerImpl.java rename to briar-core/src/main/java/org/briarproject/briar/conversation/ConversationManagerImpl.java index 1abbf6461..7431b9bec 100644 --- a/briar-core/src/main/java/org/briarproject/briar/messaging/ConversationManagerImpl.java +++ b/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; diff --git a/briar-core/src/main/java/org/briarproject/briar/conversation/ConversationModule.java b/briar-core/src/main/java/org/briarproject/briar/conversation/ConversationModule.java new file mode 100644 index 000000000..9bad2cc58 --- /dev/null +++ b/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; + } +} diff --git a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingModule.java b/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingModule.java index c9a55cff8..4f795d2cc 100644 --- a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingModule.java +++ b/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; - } - } diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java index eb48a7d9d..62e1a3d9f 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java +++ b/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, diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java index 214ccf854..c7068b880 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java +++ b/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 diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java index 56ba72fe3..f0b97ee40 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java +++ b/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 diff --git a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java index d397d7da0..d0a4ce577 100644 --- a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java +++ b/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()); diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt index d3e2a1213..d58044cad 100644 --- a/briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt +++ b/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