diff --git a/briar-core/src/org/briarproject/sync/AuthorFactoryImpl.java b/briar-core/src/org/briarproject/identity/AuthorFactoryImpl.java similarity index 95% rename from briar-core/src/org/briarproject/sync/AuthorFactoryImpl.java rename to briar-core/src/org/briarproject/identity/AuthorFactoryImpl.java index bfb768802179b112b345d8d675b9d8acc211c79d..87c03a5995b19cf9615d3ed77bf530eb45bdc036 100644 --- a/briar-core/src/org/briarproject/sync/AuthorFactoryImpl.java +++ b/briar-core/src/org/briarproject/identity/AuthorFactoryImpl.java @@ -1,4 +1,4 @@ -package org.briarproject.sync; +package org.briarproject.identity; import org.briarproject.api.crypto.CryptoComponent; import org.briarproject.api.data.BdfWriter; @@ -16,7 +16,6 @@ import javax.inject.Inject; import static org.briarproject.api.db.StorageStatus.ADDING; -// TODO: Move this class to the identity package class AuthorFactoryImpl implements AuthorFactory { private final CryptoComponent crypto; diff --git a/briar-core/src/org/briarproject/sync/AuthorReader.java b/briar-core/src/org/briarproject/identity/AuthorReader.java similarity index 92% rename from briar-core/src/org/briarproject/sync/AuthorReader.java rename to briar-core/src/org/briarproject/identity/AuthorReader.java index cb697681eebfdf0d318679625fdb6a98d87a6c7b..16be01ae63951150979a90bc28354a1f2d6c33cc 100644 --- a/briar-core/src/org/briarproject/sync/AuthorReader.java +++ b/briar-core/src/org/briarproject/identity/AuthorReader.java @@ -1,4 +1,4 @@ -package org.briarproject.sync; +package org.briarproject.identity; import org.briarproject.api.FormatException; import org.briarproject.api.data.BdfReader; @@ -11,7 +11,6 @@ import java.io.IOException; import static org.briarproject.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH; import static org.briarproject.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH; -// TODO: Move this class to the identity package class AuthorReader implements ObjectReader<Author> { private final AuthorFactory authorFactory; diff --git a/briar-core/src/org/briarproject/identity/IdentityModule.java b/briar-core/src/org/briarproject/identity/IdentityModule.java index 98134d1992aa5edabaa208719053648dca3fc83b..a57b916cc03eeab2cd6f6bd730ce2e3182b4433f 100644 --- a/briar-core/src/org/briarproject/identity/IdentityModule.java +++ b/briar-core/src/org/briarproject/identity/IdentityModule.java @@ -1,13 +1,24 @@ package org.briarproject.identity; import com.google.inject.AbstractModule; +import com.google.inject.Provides; +import org.briarproject.api.data.ObjectReader; +import org.briarproject.api.identity.Author; +import org.briarproject.api.identity.AuthorFactory; import org.briarproject.api.identity.IdentityManager; public class IdentityModule extends AbstractModule { @Override protected void configure() { + bind(AuthorFactory.class).to( + org.briarproject.identity.AuthorFactoryImpl.class); bind(IdentityManager.class).to(IdentityManagerImpl.class); } + + @Provides + ObjectReader<Author> getAuthorReader(AuthorFactory authorFactory) { + return new org.briarproject.identity.AuthorReader(authorFactory); + } } diff --git a/briar-core/src/org/briarproject/sync/SyncModule.java b/briar-core/src/org/briarproject/sync/SyncModule.java index 7a61c68a4e174f8848a270e8b7db9a4d7bbf18da..83c8f86ec503824edf796153b339aff133e0aed0 100644 --- a/briar-core/src/org/briarproject/sync/SyncModule.java +++ b/briar-core/src/org/briarproject/sync/SyncModule.java @@ -3,10 +3,7 @@ package org.briarproject.sync; import com.google.inject.AbstractModule; import com.google.inject.Provides; -import org.briarproject.api.data.ObjectReader; import org.briarproject.api.event.EventBus; -import org.briarproject.api.identity.Author; -import org.briarproject.api.identity.AuthorFactory; import org.briarproject.api.lifecycle.LifecycleManager; import org.briarproject.api.sync.GroupFactory; import org.briarproject.api.sync.MessageFactory; @@ -22,7 +19,6 @@ public class SyncModule extends AbstractModule { @Override protected void configure() { - bind(AuthorFactory.class).to(AuthorFactoryImpl.class); bind(GroupFactory.class).to(GroupFactoryImpl.class); bind(MessageFactory.class).to(MessageFactoryImpl.class); bind(PacketReaderFactory.class).to(PacketReaderFactoryImpl.class); @@ -32,11 +28,6 @@ public class SyncModule extends AbstractModule { SyncSessionFactoryImpl.class).in(Singleton.class); } - @Provides - ObjectReader<Author> getAuthorReader(AuthorFactory authorFactory) { - return new AuthorReader(authorFactory); - } - @Provides @Singleton ValidationManager getValidationManager(LifecycleManager lifecycleManager, EventBus eventBus, ValidationManagerImpl validationManager) {