diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt index c1de49679dd88bf3fd61fe23e7793689a2ae056e..908d06f6b63be01f2f1e122c13eca84d82c03e63 100644 --- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt +++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt @@ -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) } diff --git a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt index 0beeb00deff6cae3278d0bda8547f9115b33d6ab..84ad006c3f544cffc7f85acd027896eb8d39ae15 100644 --- a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt +++ b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt @@ -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) }