Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Briar Desktop
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
Briar Desktop
Commits
34ae9183
Commit
34ae9183
authored
3 years ago
by
Nico
Browse files
Options
Downloads
Patches
Plain Diff
Update Briar submodule to newest version
parent
12e4c154
No related branches found
No related tags found
No related merge requests found
Pipeline
#7959
passed
3 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
briar
+1
-1
1 addition, 1 deletion
briar
src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
+3
-6
3 additions, 6 deletions
...in/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
with
4 additions
and
7 deletions
briar
@
f5657a07
Compare
445ef081
...
f5657a07
Subproject commit
445ef0818cb80a4b7e4c1f4370293b0f869c2ece
Subproject commit
f5657a07ef8b9de9f51cb9d670c55c9ce9e1d205
This diff is collapsed.
Click to expand it.
src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
+
3
−
6
View file @
34ae9183
...
@@ -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.
Unix
TorPluginFactory
import
org.briarproject.bramble.plugin.tor.
Desktop
TorPluginFactory
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
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment