Skip to content
Snippets Groups Projects
Verified Commit 68a536f4 authored by Sebastian's avatar Sebastian
Browse files

Use MacTorPluginFactory on macOS

parent e4bc1ba5
No related branches found
No related tags found
1 merge request!332MacOS
Pipeline #14935 passed
......@@ -27,6 +27,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory
import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory
import org.briarproject.bramble.plugin.file.MailboxPluginFactory
import org.briarproject.bramble.plugin.tcp.LanTcpPluginFactory
import org.briarproject.bramble.plugin.tor.MacTorPluginFactory
import org.briarproject.bramble.plugin.tor.UnixTorPluginFactory
import org.briarproject.bramble.plugin.tor.WindowsTorPluginFactory
import org.briarproject.bramble.util.OsUtils.isLinux
......@@ -62,12 +63,14 @@ internal class DesktopModule {
@Provides
internal fun providePluginConfig(
unixTor: UnixTorPluginFactory,
macTor: MacTorPluginFactory,
winTor: WindowsTorPluginFactory,
lan: LanTcpPluginFactory,
mailbox: MailboxPluginFactory,
): PluginConfig {
val duplex: List<DuplexPluginFactory> = when {
isLinux() || isMac() -> listOf(unixTor, lan)
isLinux() -> listOf(unixTor, lan)
isMac() -> listOf(macTor, lan)
isWindows() -> listOf(winTor, lan)
else -> listOf(lan)
}
......
......@@ -27,6 +27,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory
import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory
import org.briarproject.bramble.plugin.file.MailboxPluginFactory
import org.briarproject.bramble.plugin.tcp.TestLanTcpPluginFactory
import org.briarproject.bramble.plugin.tor.MacTorPluginFactory
import org.briarproject.bramble.plugin.tor.UnixTorPluginFactory
import org.briarproject.bramble.plugin.tor.WindowsTorPluginFactory
import org.briarproject.bramble.util.OsUtils.isLinux
......@@ -76,12 +77,14 @@ internal class DesktopTestModule {
@Provides
internal fun providePluginConfig(
unixTor: UnixTorPluginFactory,
macTor: MacTorPluginFactory,
winTor: WindowsTorPluginFactory,
lan: TestLanTcpPluginFactory,
mailbox: MailboxPluginFactory,
): PluginConfig {
val duplex: List<DuplexPluginFactory> = when {
isLinux() || isMac() -> listOf(unixTor, lan)
isLinux() -> listOf(unixTor, lan)
isMac() -> listOf(macTor, lan)
isWindows() -> listOf(winTor, lan)
else -> listOf(lan)
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment