Skip to content
Snippets Groups Projects
Commit 34ae9183 authored by Nico's avatar Nico
Browse files

Update Briar submodule to newest version

parent 12e4c154
No related branches found
No related tags found
No related merge requests found
Pipeline #7959 passed
Subproject commit 445ef0818cb80a4b7e4c1f4370293b0f869c2ece Subproject commit f5657a07ef8b9de9f51cb9d670c55c9ce9e1d205
...@@ -15,15 +15,13 @@ import org.briarproject.bramble.battery.DefaultBatteryManagerModule ...@@ -15,15 +15,13 @@ import org.briarproject.bramble.battery.DefaultBatteryManagerModule
import org.briarproject.bramble.event.DefaultEventExecutorModule import org.briarproject.bramble.event.DefaultEventExecutorModule
import org.briarproject.bramble.network.JavaNetworkModule import org.briarproject.bramble.network.JavaNetworkModule
import org.briarproject.bramble.plugin.tor.CircumventionModule import org.briarproject.bramble.plugin.tor.CircumventionModule
import org.briarproject.bramble.plugin.tor.UnixTorPluginFactory import org.briarproject.bramble.plugin.tor.DesktopTorPluginFactory
import org.briarproject.bramble.socks.SocksModule import org.briarproject.bramble.socks.SocksModule
import org.briarproject.bramble.system.ClockModule import org.briarproject.bramble.system.ClockModule
import org.briarproject.bramble.system.DefaultTaskSchedulerModule import org.briarproject.bramble.system.DefaultTaskSchedulerModule
import org.briarproject.bramble.system.DefaultWakefulIoExecutorModule import org.briarproject.bramble.system.DefaultWakefulIoExecutorModule
import org.briarproject.bramble.system.DesktopSecureRandomModule import org.briarproject.bramble.system.DesktopSecureRandomModule
import org.briarproject.bramble.system.JavaSystemModule import org.briarproject.bramble.system.JavaSystemModule
import org.briarproject.bramble.util.OsUtils.isLinux
import org.briarproject.bramble.util.OsUtils.isMac
import org.briarproject.briar.desktop.ui.BriarUi import org.briarproject.briar.desktop.ui.BriarUi
import org.briarproject.briar.desktop.ui.BriarUiImpl import org.briarproject.briar.desktop.ui.BriarUiImpl
import java.io.File import java.io.File
...@@ -67,9 +65,8 @@ internal class DesktopModule(private val appDir: Path) { ...@@ -67,9 +65,8 @@ internal class DesktopModule(private val appDir: Path) {
} }
@Provides @Provides
internal fun providePluginConfig(tor: UnixTorPluginFactory): PluginConfig { internal fun providePluginConfig(tor: DesktopTorPluginFactory): PluginConfig {
val duplex: List<DuplexPluginFactory> = val duplex: List<DuplexPluginFactory> = listOf(tor)
if (isLinux() || isMac()) listOf(tor) else emptyList()
return object : PluginConfig { return object : PluginConfig {
override fun getDuplexFactories(): Collection<DuplexPluginFactory> = duplex override fun getDuplexFactories(): Collection<DuplexPluginFactory> = duplex
override fun getSimplexFactories(): Collection<SimplexPluginFactory> = emptyList() override fun getSimplexFactories(): Collection<SimplexPluginFactory> = emptyList()
......
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