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

Make it possible to start the headless app on MacOS.

Browse Source 
The app is still non-functional because we don't have a Tor plugin.
This commit is contained in:
akwizgran
2018-11-23 12:52:40 +00:00
parent c09abdb088
commit 61276c81d2
7 changed files with 72 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ 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.system.JavaSystemModule
import org.briarproject.bramble.util.OsUtils
import org.briarproject.bramble.util.StringUtils.fromHexString
import org.briarproject.briar.headless.blogs.HeadlessBlogModule
import org.briarproject.briar.headless.contact.HeadlessContactModule
@@ -70,11 +71,17 @@ internal class HeadlessModule(private val appDir: File) {
circumventionProvider: CircumventionProvider, batteryManager: BatteryManager, clock: Clock
): PluginConfig {
val torDirectory = File(appDir, "tor")
val tor = LinuxTorPluginFactory(
ioExecutor, networkManager, locationUtils, eventBus, torSocketFactory, backoffFactory,
resourceProvider, circumventionProvider, batteryManager, clock, torDirectory
)
val duplex = listOf<DuplexPluginFactory>(tor)
val duplex: List<DuplexPluginFactory>
if (OsUtils.isLinux()) {
val tor = LinuxTorPluginFactory(
ioExecutor, networkManager, locationUtils, eventBus,
torSocketFactory, backoffFactory, resourceProvider, circumventionProvider,
batteryManager, clock, torDirectory
)
duplex = listOf(tor)
} else {
duplex = emptyList()
}
return object : PluginConfig {
override fun getDuplexFactories(): Collection<DuplexPluginFactory> {
return duplex