diff --git a/briar-core/src/org/briarproject/CoreEagerSingletons.java b/briar-core/src/org/briarproject/CoreEagerSingletons.java index d7b0c1bee1c8c725d7ede60ecd9f11356adef455..f0899dc2df78e2bc5f827910cc61dfb261b7c502 100644 --- a/briar-core/src/org/briarproject/CoreEagerSingletons.java +++ b/briar-core/src/org/briarproject/CoreEagerSingletons.java @@ -5,6 +5,7 @@ import org.briarproject.contact.ContactModule; import org.briarproject.crypto.CryptoModule; import org.briarproject.db.DatabaseExecutorModule; import org.briarproject.forum.ForumModule; +import org.briarproject.identity.IdentityModule; import org.briarproject.introduction.IntroductionModule; import org.briarproject.lifecycle.LifecycleModule; import org.briarproject.messaging.MessagingModule; @@ -27,6 +28,8 @@ public interface CoreEagerSingletons { void inject(ForumModule.EagerSingletons init); + void inject(IdentityModule.EagerSingletons init); + void inject(IntroductionModule.EagerSingletons init); void inject(LifecycleModule.EagerSingletons init); diff --git a/briar-core/src/org/briarproject/CoreModule.java b/briar-core/src/org/briarproject/CoreModule.java index 140f0b7e67f1ef6437c65a7ca1d052b0568786c5..d5db624408eafc41372ee6c3e366aa015d073dc6 100644 --- a/briar-core/src/org/briarproject/CoreModule.java +++ b/briar-core/src/org/briarproject/CoreModule.java @@ -61,6 +61,7 @@ public class CoreModule { c.inject(new CryptoModule.EagerSingletons()); c.inject(new DatabaseExecutorModule.EagerSingletons()); c.inject(new ForumModule.EagerSingletons()); + c.inject(new IdentityModule.EagerSingletons()); c.inject(new LifecycleModule.EagerSingletons()); c.inject(new MessagingModule.EagerSingletons()); c.inject(new PluginsModule.EagerSingletons()); diff --git a/briar-core/src/org/briarproject/identity/IdentityModule.java b/briar-core/src/org/briarproject/identity/IdentityModule.java index e2701561292b08e5b444f15f336741d84fcf9d00..c03ee24efb563ed121cbbf5139a68303a30e0ad2 100644 --- a/briar-core/src/org/briarproject/identity/IdentityModule.java +++ b/briar-core/src/org/briarproject/identity/IdentityModule.java @@ -4,15 +4,12 @@ import org.briarproject.api.crypto.CryptoComponent; import org.briarproject.api.data.BdfWriterFactory; import org.briarproject.api.data.ObjectReader; import org.briarproject.api.db.DatabaseComponent; -import org.briarproject.api.event.EventBus; import org.briarproject.api.identity.Author; import org.briarproject.api.identity.AuthorFactory; import org.briarproject.api.identity.IdentityManager; import org.briarproject.api.system.Clock; -import org.briarproject.crypto.CryptoModule; -import org.briarproject.data.DataModule; -import org.briarproject.db.DatabaseModule; +import javax.inject.Inject; import javax.inject.Singleton; import dagger.Module; @@ -21,6 +18,11 @@ import dagger.Provides; @Module public class IdentityModule { + public static class EagerSingletons { + @Inject + IdentityManager identityManager; + } + @Provides AuthorFactory provideAuthorFactory(CryptoComponent crypto, BdfWriterFactory bdfWriterFactory, Clock clock) { @@ -28,6 +30,7 @@ public class IdentityModule { } @Provides + @Singleton IdentityManager provideIdendityModule(DatabaseComponent db) { return new IdentityManagerImpl(db); }