Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Remove transport preferences for briar-headless.

Browse Source
This commit is contained in:
akwizgran
2020-06-25 17:46:22 +01:00
parent 78d7fc2106
commit 95f427863d
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
View File

@@ -9,7 +9,9 @@ import org.briarproject.bramble.api.db.DatabaseConfig
import org.briarproject.bramble.api.event.EventBus import org.briarproject.bramble.api.event.EventBus
import org.briarproject.bramble.api.lifecycle.IoExecutor import org.briarproject.bramble.api.lifecycle.IoExecutor
import org.briarproject.bramble.api.network.NetworkManager 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.duplex.DuplexPluginFactory
import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory
import org.briarproject.bramble.api.system.Clock 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 org.briarproject.briar.headless.messaging.HeadlessMessagingModule
import java.io.File import java.io.File
import java.util.Collections.emptyList import java.util.Collections.emptyList
import java.util.Collections.singletonMap
import java.util.concurrent.Executor import java.util.concurrent.Executor
import javax.inject.Singleton import javax.inject.Singleton
import javax.net.SocketFactory import javax.net.SocketFactory
@@ -88,9 +89,7 @@ internal class HeadlessModule(private val appDir: File) {
override fun getDuplexFactories(): Collection<DuplexPluginFactory> = duplex override fun getDuplexFactories(): Collection<DuplexPluginFactory> = duplex
override fun getSimplexFactories(): Collection<SimplexPluginFactory> = emptyList() override fun getSimplexFactories(): Collection<SimplexPluginFactory> = emptyList()
override fun shouldPoll(): Boolean = true override fun shouldPoll(): Boolean = true
// Prefer LAN to Bluetooth override fun getTransportPreferences(): Map<TransportId, List<TransportId>> = emptyMap()
override fun getTransportPreferences(): Map<TransportId, List<TransportId>> =
singletonMap(BluetoothConstants.ID, listOf(LanTcpConstants.ID))
} }
} }

7
briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt
View File

@@ -5,8 +5,6 @@ import dagger.Module
import dagger.Provides import dagger.Provides
import org.briarproject.bramble.api.FeatureFlags import org.briarproject.bramble.api.FeatureFlags
import org.briarproject.bramble.api.db.DatabaseConfig 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.PluginConfig
import org.briarproject.bramble.api.plugin.TransportId import org.briarproject.bramble.api.plugin.TransportId
import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory 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.forums.HeadlessForumModule
import org.briarproject.briar.headless.messaging.HeadlessMessagingModule import org.briarproject.briar.headless.messaging.HeadlessMessagingModule
import java.io.File import java.io.File
import java.util.*
import java.util.Collections.emptyList import java.util.Collections.emptyList
import javax.inject.Singleton import javax.inject.Singleton
@@ -59,9 +56,7 @@ internal class HeadlessTestModule(private val appDir: File) {
override fun getDuplexFactories(): Collection<DuplexPluginFactory> = emptyList() override fun getDuplexFactories(): Collection<DuplexPluginFactory> = emptyList()
override fun getSimplexFactories(): Collection<SimplexPluginFactory> = emptyList() override fun getSimplexFactories(): Collection<SimplexPluginFactory> = emptyList()
override fun shouldPoll(): Boolean = false override fun shouldPoll(): Boolean = false
// Prefer LAN to Bluetooth override fun getTransportPreferences(): Map<TransportId, List<TransportId>> = emptyMap()
override fun getTransportPreferences(): Map<TransportId, List<TransportId>> =
Collections.singletonMap(BluetoothConstants.ID, listOf(LanTcpConstants.ID))
} }
} }