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

rebased with master

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-03-08 23:05:10 +01:00
parent 9af3ce123a
commit 10764d727b
12 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,11 +10,14 @@ 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.messaging.MessagingManager;
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 org.briarproject.messaging.PrivateMessageValidator;
import org.briarproject.properties.TransportPropertyValidator;
import java.io.File;
@@ -41,6 +44,14 @@ public class AndroidModule {
AndroidNotificationManager androidNotificationManager;
@Inject
TransportPropertyManager transportPropertyManager;
@Inject
MessagingManager messagingManager;
@Inject
PrivateMessageValidator privateMessageValidator;
@Inject
TransportPropertyValidator transportPropertyValidator;
}
static void injectEager(AndroidComponent c) {

2
briar-android/src/org/briarproject/android/BriarApplication.java
View File

@@ -6,8 +6,6 @@ import java.util.logging.Logger;
import android.app.Application;
import android.content.Context;
import org.briarproject.event.EventModule;
public class BriarApplication extends Application {
private static final Logger LOG =