Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Enable Tor on Mac OS once binaries are available.

Browse Source
This commit is contained in:
akwizgran
2018-11-23 13:07:12 +00:00
parent ce7d6d3db5
commit bc352a2dc6
5 changed files with 64 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,9 +24,10 @@ import org.briarproject.bramble.battery.DefaultBatteryManagerModule
import org.briarproject.bramble.network.JavaNetworkModule
import org.briarproject.bramble.plugin.tor.CircumventionModule
import org.briarproject.bramble.plugin.tor.CircumventionProvider
import org.briarproject.bramble.plugin.tor.LinuxTorPluginFactory
import org.briarproject.bramble.plugin.tor.UnixTorPluginFactory
import org.briarproject.bramble.system.JavaSystemModule
import org.briarproject.bramble.util.OsUtils.isLinux
import org.briarproject.bramble.util.OsUtils.isMac
import org.briarproject.bramble.util.StringUtils.fromHexString
import org.briarproject.briar.headless.blogs.HeadlessBlogModule
import org.briarproject.briar.headless.contact.HeadlessContactModule
@@ -72,11 +73,11 @@ internal class HeadlessModule(private val appDir: File) {
): PluginConfig {
val torDirectory = File(appDir, "tor")
val duplex: List<DuplexPluginFactory>
if (isLinux()) {
val tor = LinuxTorPluginFactory(
ioExecutor, networkManager, locationUtils, eventBus,
torSocketFactory, backoffFactory, resourceProvider, circumventionProvider,
batteryManager, clock, torDirectory
if (isLinux() || isMac()) {
val tor = UnixTorPluginFactory(
ioExecutor, networkManager, locationUtils, eventBus, torSocketFactory,
backoffFactory, resourceProvider, circumventionProvider, batteryManager, clock,
torDirectory
)
duplex = listOf(tor)
} else {