Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Fixed merge issues.

Browse Source
This commit is contained in:
akwizgran
2016-03-15 20:26:50 +00:00
parent c2a1cc1e4e
commit 3d57516258
4 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-android/src/org/briarproject/android/AndroidComponent.java
View File

@@ -11,7 +11,6 @@ import org.briarproject.android.forum.ForumListFragment;
import org.briarproject.android.forum.ReadForumPostActivity; import org.briarproject.android.forum.ReadForumPostActivity;
import org.briarproject.android.forum.ShareForumActivity; import org.briarproject.android.forum.ShareForumActivity;
import org.briarproject.android.forum.WriteForumPostActivity; import org.briarproject.android.forum.WriteForumPostActivity;
import org.briarproject.android.fragment.SettingsFragment;
import org.briarproject.android.identity.CreateIdentityActivity; import org.briarproject.android.identity.CreateIdentityActivity;
import org.briarproject.android.invitation.AddContactActivity; import org.briarproject.android.invitation.AddContactActivity;
import org.briarproject.android.panic.PanicPreferencesActivity; import org.briarproject.android.panic.PanicPreferencesActivity;
@@ -63,9 +62,9 @@ public interface AndroidComponent extends CoreEagerSingletons {
void inject(ForumActivity activity); void inject(ForumActivity activity);
void inject(ContactListFragment fragment); void inject(SettingsActivity activity);
void inject(SettingsFragment fragment); void inject(ContactListFragment fragment);
void inject(ForumListFragment fragment); void inject(ForumListFragment fragment);

10
briar-android/src/org/briarproject/android/SettingsActivity.java
View File

@@ -11,8 +11,9 @@ import org.briarproject.api.settings.SettingsManager;
import javax.inject.Inject; import javax.inject.Inject;
public class SettingsActivity extends BriarActivity { public class SettingsActivity extends BriarActivity {
@Inject private SettingsManager settingsManager;
@Inject private EventBus eventBus; @Inject protected SettingsManager settingsManager;
@Inject protected EventBus eventBus;
@Override @Override
public void onCreate(Bundle bundle) { public void onCreate(Bundle bundle) {
@@ -27,6 +28,11 @@ public class SettingsActivity extends BriarActivity {
setContentView(R.layout.activity_settings); setContentView(R.layout.activity_settings);
} }
@Override
public void injectActivity(AndroidComponent component) {
component.inject(this);
}
public SettingsManager getSettingsManager() { public SettingsManager getSettingsManager() {
return settingsManager; return settingsManager;
} }

24
briar-core/src/org/briarproject/clients/ClientsModule.java
View File

@@ -1,7 +1,10 @@
package org.briarproject.clients; package org.briarproject.clients;
import org.briarproject.api.clients.ClientHelper; import org.briarproject.api.clients.ClientHelper;
import org.briarproject.api.clients.MessageQueueManager;
import org.briarproject.api.clients.PrivateGroupFactory; import org.briarproject.api.clients.PrivateGroupFactory;
import org.briarproject.api.clients.QueueMessageFactory;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.data.BdfReaderFactory; import org.briarproject.api.data.BdfReaderFactory;
import org.briarproject.api.data.BdfWriterFactory; import org.briarproject.api.data.BdfWriterFactory;
import org.briarproject.api.data.MetadataEncoder; import org.briarproject.api.data.MetadataEncoder;
@@ -9,10 +12,7 @@ import org.briarproject.api.data.MetadataParser;
import org.briarproject.api.db.DatabaseComponent; import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.sync.GroupFactory; import org.briarproject.api.sync.GroupFactory;
import org.briarproject.api.sync.MessageFactory; import org.briarproject.api.sync.MessageFactory;
import org.briarproject.data.DataModule; import org.briarproject.api.sync.ValidationManager;
import org.briarproject.db.DatabaseModule;
import org.briarproject.messaging.MessagingModule;
import org.briarproject.sync.SyncModule;
import dagger.Module; import dagger.Module;
import dagger.Provides; import dagger.Provides;
@@ -31,10 +31,20 @@ public class ClientsModule {
@Provides @Provides
PrivateGroupFactory providePrivateGroupFactory(GroupFactory groupFactory, PrivateGroupFactory providePrivateGroupFactory(GroupFactory groupFactory,
BdfWriterFactory bdfWriterFactory) { ClientHelper clientHelper) {
return new PrivateGroupFactoryImpl(groupFactory, bdfWriterFactory); return new PrivateGroupFactoryImpl(groupFactory, clientHelper);
} }
bind(QueueMessageFactory.class).to(QueueMessageFactoryImpl.class); @Provides
MessageQueueManager provideMessageQueueManager(DatabaseComponent db,
ClientHelper clientHelper, QueueMessageFactory queueMessageFactory,
ValidationManager validationManager) {
return new MessageQueueManagerImpl(db, clientHelper,
queueMessageFactory, validationManager);
}
@Provides
QueueMessageFactory provideQueueMessageFactory(CryptoComponent crypto) {
return new QueueMessageFactoryImpl(crypto);
}
} }

3
briar-core/src/org/briarproject/clients/PrivateGroupFactoryImpl.java
View File

@@ -1,6 +1,5 @@
package org.briarproject.clients; package org.briarproject.clients;
import com.google.inject.Inject;
import org.briarproject.api.Bytes; import org.briarproject.api.Bytes;
import org.briarproject.api.FormatException; import org.briarproject.api.FormatException;
@@ -13,6 +12,8 @@ import org.briarproject.api.sync.ClientId;
import org.briarproject.api.sync.Group; import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupFactory; import org.briarproject.api.sync.GroupFactory;
import javax.inject.Inject;
class PrivateGroupFactoryImpl implements PrivateGroupFactory { class PrivateGroupFactoryImpl implements PrivateGroupFactory {
private final GroupFactory groupFactory; private final GroupFactory groupFactory;