Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Move ConversationManagerImpl to conversation package.

Browse Source
This commit is contained in:
akwizgran
2021-02-25 16:00:49 +00:00
committed by Torsten Grote
parent 3ecd1c62b8
commit c89bde08db
10 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-core/src/main/java/org/briarproject/briar/BriarCoreEagerSingletons.java
View File

@@ -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());

4
briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java
View File

@@ -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,

2
briar-core/src/main/java/org/briarproject/briar/messaging/ConversationManagerImpl.java → briar-core/src/main/java/org/briarproject/briar/conversation/ConversationManagerImpl.java
View File

@@ -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;

25
briar-core/src/main/java/org/briarproject/briar/conversation/ConversationModule.java Normal file
View File

@@ -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;
}
}

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

@@ -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;
}
}

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

@@ -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,

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

@@ -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

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

@@ -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

5
briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java
View File

@@ -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());

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

@@ -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