From 68a536f41ea31a81af64727f5c6d533d0b54d43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Tue, 20 Jun 2023 14:28:24 +0200
Subject: [PATCH] Use MacTorPluginFactory on macOS
---
.../kotlin/org/briarproject/briar/desktop/DesktopModule.kt | 5 ++++-
.../org/briarproject/briar/desktop/DesktopTestModule.kt | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
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 c1de49679d..908d06f6b6 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 0beeb00def..84ad006c3f 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)
}
--
GitLab