From 0e55b06c0aeb4623b23c4cbbc950791ae635876c Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 31 May 2019 14:53:24 +0100
Subject: [PATCH] Provide SOCKS module for headless app, remove reporting.

---
 .../All_in_briar_headless.xml                 | 20 --------------
 .../All_tests_in_briar_headless.xml           | 15 +++++++++++
 .../briar/headless/HeadlessModule.kt          | 26 ++-----------------
 .../briar/headless/HeadlessTestModule.kt      | 12 ++-------
 4 files changed, 19 insertions(+), 54 deletions(-)
 delete mode 100644 .idea/runConfigurations/All_in_briar_headless.xml
 create mode 100644 .idea/runConfigurations/All_tests_in_briar_headless.xml

diff --git a/.idea/runConfigurations/All_in_briar_headless.xml b/.idea/runConfigurations/All_in_briar_headless.xml
deleted file mode 100644
index 906ace467..000000000
--- a/.idea/runConfigurations/All_in_briar_headless.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All in briar-headless" type="AndroidJUnit" factoryName="Android JUnit" nameIsGenerated="true">
-    <module name="briar-headless" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="PACKAGE_NAME" value="org.briarproject.briar.headless" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-headless" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <patterns />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_tests_in_briar_headless.xml b/.idea/runConfigurations/All_tests_in_briar_headless.xml
new file mode 100644
index 000000000..a60d9f518
--- /dev/null
+++ b/.idea/runConfigurations/All_tests_in_briar_headless.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All tests in briar-headless" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar-headless" />
+    <option name="PACKAGE_NAME" value="org.briarproject.briar.headless" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/briar-headless" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
index 53ce493d3..1a4c2a4b0 100644
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
@@ -4,8 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import dagger.Module
 import dagger.Provides
 import org.briarproject.bramble.api.battery.BatteryManager
-import org.briarproject.bramble.api.crypto.CryptoComponent
-import org.briarproject.bramble.api.crypto.PublicKey
 import org.briarproject.bramble.api.db.DatabaseConfig
 import org.briarproject.bramble.api.event.EventBus
 import org.briarproject.bramble.api.lifecycle.IoExecutor
@@ -14,9 +12,6 @@ import org.briarproject.bramble.api.plugin.BackoffFactory
 import org.briarproject.bramble.api.plugin.PluginConfig
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory
 import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory
-import org.briarproject.bramble.api.reporting.DevConfig
-import org.briarproject.bramble.api.reporting.ReportingConstants.DEV_ONION_ADDRESS
-import org.briarproject.bramble.api.reporting.ReportingConstants.DEV_PUBLIC_KEY_HEX
 import org.briarproject.bramble.api.system.Clock
 import org.briarproject.bramble.api.system.LocationUtils
 import org.briarproject.bramble.api.system.ResourceProvider
@@ -26,17 +21,16 @@ import org.briarproject.bramble.network.JavaNetworkModule
 import org.briarproject.bramble.plugin.tor.CircumventionModule
 import org.briarproject.bramble.plugin.tor.CircumventionProvider
 import org.briarproject.bramble.plugin.tor.UnixTorPluginFactory
+import org.briarproject.bramble.socks.SocksModule
 import org.briarproject.bramble.system.JavaSystemModule
 import org.briarproject.bramble.util.OsUtils.isLinux
 import org.briarproject.bramble.util.OsUtils.isMac
-import org.briarproject.bramble.util.StringUtils.fromHexString
 import org.briarproject.briar.headless.blogs.HeadlessBlogModule
 import org.briarproject.briar.headless.contact.HeadlessContactModule
 import org.briarproject.briar.headless.event.HeadlessEventModule
 import org.briarproject.briar.headless.forums.HeadlessForumModule
 import org.briarproject.briar.headless.messaging.HeadlessMessagingModule
 import java.io.File
-import java.security.GeneralSecurityException
 import java.util.Collections.emptyList
 import java.util.concurrent.Executor
 import javax.inject.Singleton
@@ -49,6 +43,7 @@ import javax.net.SocketFactory
         CircumventionModule::class,
         DefaultBatteryManagerModule::class,
         DefaultEventExecutorModule::class,
+        SocksModule::class,
         HeadlessBlogModule::class,
         HeadlessContactModule::class,
         HeadlessEventModule::class,
@@ -95,23 +90,6 @@ internal class HeadlessModule(private val appDir: File) {
         }
     }
 
-    @Provides
-    @Singleton
-    internal fun provideDevConfig(crypto: CryptoComponent): DevConfig {
-        return object : DevConfig {
-            override fun getDevPublicKey(): PublicKey {
-                try {
-                    return crypto.messageKeyParser.parsePublicKey(fromHexString(DEV_PUBLIC_KEY_HEX))
-                } catch (e: GeneralSecurityException) {
-                    throw RuntimeException(e)
-                }
-            }
-
-            override fun getDevOnionAddress(): String = DEV_ONION_ADDRESS
-            override fun getReportDir(): File = File(appDir, "reportDir")
-        }
-    }
-
     @Provides
     @Singleton
     internal fun provideObjectMapper() = ObjectMapper()
diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt
index 256a80c76..c8f2b7d21 100644
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt
@@ -3,14 +3,13 @@ package org.briarproject.briar.headless
 import com.fasterxml.jackson.databind.ObjectMapper
 import dagger.Module
 import dagger.Provides
-import org.briarproject.bramble.api.crypto.PublicKey
 import org.briarproject.bramble.api.db.DatabaseConfig
 import org.briarproject.bramble.api.plugin.PluginConfig
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory
 import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory
-import org.briarproject.bramble.api.reporting.DevConfig
 import org.briarproject.bramble.network.JavaNetworkModule
 import org.briarproject.bramble.plugin.tor.CircumventionModule
+import org.briarproject.bramble.socks.SocksModule
 import org.briarproject.bramble.system.JavaSystemModule
 import org.briarproject.briar.headless.blogs.HeadlessBlogModule
 import org.briarproject.briar.headless.contact.HeadlessContactModule
@@ -26,6 +25,7 @@ import javax.inject.Singleton
         JavaNetworkModule::class,
         JavaSystemModule::class,
         CircumventionModule::class,
+        SocksModule::class,
         HeadlessBlogModule::class,
         HeadlessContactModule::class,
         HeadlessEventModule::class,
@@ -57,14 +57,6 @@ internal class HeadlessTestModule(private val appDir: File) {
         }
     }
 
-    @Provides
-    @Singleton
-    internal fun provideDevConfig(): DevConfig = object : DevConfig {
-        override fun getDevPublicKey(): PublicKey = throw NotImplementedError()
-        override fun getDevOnionAddress(): String = throw NotImplementedError()
-        override fun getReportDir(): File = throw NotImplementedError()
-    }
-
     @Provides
     @Singleton
     internal fun provideObjectMapper() = ObjectMapper()