From 95f427863db6500feda22f0a9101161e4aba2fcf Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 25 Jun 2020 17:46:22 +0100
Subject: [PATCH] Remove transport preferences for briar-headless.

---
 .../org/briarproject/briar/headless/HeadlessModule.kt    | 9 ++++-----
 .../briarproject/briar/headless/HeadlessTestModule.kt    | 7 +------
 2 files changed, 5 insertions(+), 11 deletions(-)

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 5cfdac462..c74b36225 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
@@ -9,7 +9,9 @@ import org.briarproject.bramble.api.db.DatabaseConfig
 import org.briarproject.bramble.api.event.EventBus
 import org.briarproject.bramble.api.lifecycle.IoExecutor
 import org.briarproject.bramble.api.network.NetworkManager
-import org.briarproject.bramble.api.plugin.*
+import org.briarproject.bramble.api.plugin.BackoffFactory
+import org.briarproject.bramble.api.plugin.PluginConfig
+import org.briarproject.bramble.api.plugin.TransportId
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory
 import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory
 import org.briarproject.bramble.api.system.Clock
@@ -32,7 +34,6 @@ import org.briarproject.briar.headless.forums.HeadlessForumModule
 import org.briarproject.briar.headless.messaging.HeadlessMessagingModule
 import java.io.File
 import java.util.Collections.emptyList
-import java.util.Collections.singletonMap
 import java.util.concurrent.Executor
 import javax.inject.Singleton
 import javax.net.SocketFactory
@@ -88,9 +89,7 @@ internal class HeadlessModule(private val appDir: File) {
             override fun getDuplexFactories(): Collection<DuplexPluginFactory> = duplex
             override fun getSimplexFactories(): Collection<SimplexPluginFactory> = emptyList()
             override fun shouldPoll(): Boolean = true
-            // Prefer LAN to Bluetooth
-            override fun getTransportPreferences(): Map<TransportId, List<TransportId>> =
-                singletonMap(BluetoothConstants.ID, listOf(LanTcpConstants.ID))
+            override fun getTransportPreferences(): Map<TransportId, List<TransportId>> = emptyMap()
         }
     }
 
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 f02dc5799..8482441e5 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
@@ -5,8 +5,6 @@ import dagger.Module
 import dagger.Provides
 import org.briarproject.bramble.api.FeatureFlags
 import org.briarproject.bramble.api.db.DatabaseConfig
-import org.briarproject.bramble.api.plugin.BluetoothConstants
-import org.briarproject.bramble.api.plugin.LanTcpConstants
 import org.briarproject.bramble.api.plugin.PluginConfig
 import org.briarproject.bramble.api.plugin.TransportId
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory
@@ -21,7 +19,6 @@ 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.util.*
 import java.util.Collections.emptyList
 import javax.inject.Singleton
 
@@ -59,9 +56,7 @@ internal class HeadlessTestModule(private val appDir: File) {
             override fun getDuplexFactories(): Collection<DuplexPluginFactory> = emptyList()
             override fun getSimplexFactories(): Collection<SimplexPluginFactory> = emptyList()
             override fun shouldPoll(): Boolean = false
-            // Prefer LAN to Bluetooth
-            override fun getTransportPreferences(): Map<TransportId, List<TransportId>> =
-                Collections.singletonMap(BluetoothConstants.ID, listOf(LanTcpConstants.ID))
+            override fun getTransportPreferences(): Map<TransportId, List<TransportId>> = emptyMap()
         }
     }