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
cab4e5c0
Verified
Commit
cab4e5c0
authored
2 years ago
by
Sebastian
Committed by
Mikolai Gütschow
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Upgrade briar-core to 1.4.11
parent
b3fb8e6a
No related branches found
Branches containing commit
No related tags found
1 merge request
!232
Upgrade briar-core to 1.4.11
Pipeline
#12164
passed
2 years ago
Stage: test
Stage: build
Changes
2
Pipelines
9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
briar
+1
-1
1 addition, 1 deletion
briar
briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/DesktopCoreModule.kt
+7
-0
7 additions, 0 deletions
...otlin/org/briarproject/briar/desktop/DesktopCoreModule.kt
with
8 additions
and
1 deletion
briar
@
2aa39e43
Compare
7536f16c
...
2aa39e43
Subproject commit
7536f16c6136ebd5700a0f0ad49441050cf60096
Subproject commit
2aa39e43ef427ecf47a3e9e7a3e82884a354e56a
This diff is collapsed.
Click to expand it.
briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/DesktopCoreModule.kt
+
7
−
0
View file @
cab4e5c0
...
@@ -26,6 +26,7 @@ import kotlinx.coroutines.swing.Swing
...
@@ -26,6 +26,7 @@ import kotlinx.coroutines.swing.Swing
import
org.briarproject.bramble.account.AccountModule
import
org.briarproject.bramble.account.AccountModule
import
org.briarproject.bramble.api.db.DatabaseConfig
import
org.briarproject.bramble.api.db.DatabaseConfig
import
org.briarproject.bramble.api.event.EventExecutor
import
org.briarproject.bramble.api.event.EventExecutor
import
org.briarproject.bramble.api.mailbox.MailboxDirectory
import
org.briarproject.bramble.api.plugin.PluginConfig
import
org.briarproject.bramble.api.plugin.PluginConfig
import
org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT
import
org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT
import
org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT
import
org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT
...
@@ -147,6 +148,12 @@ internal class DesktopCoreModule(
...
@@ -147,6 +148,12 @@ internal class DesktopCoreModule(
@Singleton
@Singleton
fun
provideBriarExecutors
(
briarExecutors
:
BriarExecutorsImpl
):
BriarExecutors
=
briarExecutors
fun
provideBriarExecutors
(
briarExecutors
:
BriarExecutorsImpl
):
BriarExecutors
=
briarExecutors
@Provides
@MailboxDirectory
internal
fun
provideMailboxDirectory
():
File
{
return
appDir
.
resolve
(
"mailbox"
).
toFile
()
}
@Provides
@Provides
@TorDirectory
@TorDirectory
internal
fun
provideTorDirectory
():
File
=
internal
fun
provideTorDirectory
():
File
=
...
...
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