From b1c1872f716a5d858b22210759bb72b49e28497f Mon Sep 17 00:00:00 2001
From: goapunk <goapunk@riseup.net>
Date: Mon, 9 Jul 2018 10:08:02 +0200
Subject: [PATCH] mailbox fixup
---
.../main/java/org/briarproject/mailbox/AndroidComponent.java | 4 ++++
.../src/main/java/org/briarproject/mailbox/AppModule.java | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/AndroidComponent.java b/mailbox-android/src/main/java/org/briarproject/mailbox/AndroidComponent.java
index 83041f65b..3fc1830a0 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/AndroidComponent.java
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/AndroidComponent.java
@@ -5,6 +5,7 @@ import android.content.SharedPreferences;
import org.briarproject.bramble.BrambleAndroidModule;
import org.briarproject.bramble.BrambleCoreEagerSingletons;
import org.briarproject.bramble.BrambleCoreModule;
+import org.briarproject.bramble.api.contact.ContactExchangeTask;
import org.briarproject.bramble.api.contact.ContactManager;
import org.briarproject.bramble.api.crypto.CryptoComponent;
import org.briarproject.bramble.api.crypto.CryptoExecutor;
@@ -23,6 +24,7 @@ import org.briarproject.bramble.api.plugin.PluginManager;
import org.briarproject.bramble.api.settings.SettingsManager;
import org.briarproject.bramble.api.system.AndroidExecutor;
import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.mailbox.api.android.AndroidNotificationManager;
import org.briarproject.mailbox.api.android.DozeWatchdog;
import org.briarproject.mailbox.api.android.ScreenFilterMonitor;
import org.briarproject.mailbox.reporting.MailboxReportSender;
@@ -73,6 +75,8 @@ public interface AndroidComponent
SettingsManager settingsManager();
+ ContactExchangeTask contactExchangeTask();
+
KeyAgreementTask keyAgreementTask();
PayloadEncoder payloadEncoder();
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/AppModule.java b/mailbox-android/src/main/java/org/briarproject/mailbox/AppModule.java
index 5c694591d..243beb3b8 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/AppModule.java
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/AppModule.java
@@ -25,6 +25,7 @@ import org.briarproject.bramble.api.system.LocationUtils;
import org.briarproject.bramble.api.system.Scheduler;
import org.briarproject.bramble.plugin.bluetooth.AndroidBluetoothPluginFactory;
import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory;
+import org.briarproject.bramble.plugin.tor.CircumventionProvider;
import org.briarproject.bramble.plugin.tor.TorPluginFactory;
import org.briarproject.bramble.util.AndroidUtils;
import org.briarproject.bramble.util.StringUtils;
@@ -96,6 +97,7 @@ public class AppModule {
AndroidExecutor androidExecutor, SecureRandom random,
SocketFactory torSocketFactory, BackoffFactory backoffFactory,
Application app, LocationUtils locationUtils, EventBus eventBus,
+ CircumventionProvider circumventionProvider,
Clock clock) {
Context appContext = app.getApplicationContext();
DuplexPluginFactory bluetooth =
@@ -103,7 +105,7 @@ public class AppModule {
appContext, random, eventBus, backoffFactory);
DuplexPluginFactory tor = new TorPluginFactory(ioExecutor, scheduler,
appContext, locationUtils, eventBus, torSocketFactory,
- backoffFactory, clock);
+ backoffFactory, circumventionProvider, clock);
DuplexPluginFactory lan = new AndroidLanTcpPluginFactory(ioExecutor,
scheduler, backoffFactory, appContext);
Collection<DuplexPluginFactory> duplex = asList(bluetooth, tor, lan);
--
GitLab