Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

Added eager singletons and made some fixes

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-03-08 22:35:42 +01:00
parent 5aba1d79f1
commit 9af3ce123a
17 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
briar-android/src/org/briarproject/android/AndroidModule.java
View File

@@ -1,20 +1,24 @@
package org.briarproject.android;
import android.app.Application;
import android.content.SharedPreferences;
import android.support.v7.preference.PreferenceManager;
import org.briarproject.api.android.AndroidExecutor;
import org.briarproject.api.android.AndroidNotificationManager;
import org.briarproject.api.android.ReferenceManager;
import org.briarproject.api.contact.ContactManager;
import org.briarproject.api.crypto.SecretKey;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.api.event.EventBus;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.plugins.PluginManager;
import org.briarproject.api.properties.TransportPropertyManager;
import org.briarproject.api.sync.ValidationManager;
import org.briarproject.api.transport.KeyManager;
import org.briarproject.api.ui.UiCallback;
import java.io.File;
import javax.inject.Inject;
import javax.inject.Singleton;
import dagger.Module;
@@ -25,6 +29,24 @@ import static android.content.Context.MODE_PRIVATE;
@Module
public class AndroidModule {
static class EagerSingletons {
// Load all relevant eager singletons and their references
@Inject
KeyManager keyManager;
@Inject
ValidationManager validationManager;
@Inject
PluginManager pluginManager;
@Inject
AndroidNotificationManager androidNotificationManager;
@Inject
TransportPropertyManager transportPropertyManager;
}
static void injectEager(AndroidComponent c) {
c.inject(new EagerSingletons());
}
private final UiCallback uiCallback;
public AndroidModule() {
@@ -93,7 +115,6 @@ public class AndroidModule {
};
}
@Provides
@Singleton
AndroidNotificationManager provideAndroidNotificationManager(