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
fac2b795
Verified
Commit
fac2b795
authored
3 years ago
by
Mikolai Gütschow
Browse files
Options
Downloads
Patches
Plain Diff
bind EventExecutor to UI thread
parent
beefaa80
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!55
Query data from Briar outside of UI thread
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
+12
-2
12 additions, 2 deletions
...in/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
with
12 additions
and
2 deletions
src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
+
12
−
2
View file @
fac2b795
...
...
@@ -2,9 +2,13 @@ package org.briarproject.briar.desktop
import
dagger.Module
import
dagger.Provides
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.asExecutor
import
kotlinx.coroutines.swing.Swing
import
org.briarproject.bramble.account.AccountModule
import
org.briarproject.bramble.api.FeatureFlags
import
org.briarproject.bramble.api.db.DatabaseConfig
import
org.briarproject.bramble.api.event.EventExecutor
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_SOCKS_PORT
...
...
@@ -15,7 +19,6 @@ import org.briarproject.bramble.api.plugin.TransportId
import
org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory
import
org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory
import
org.briarproject.bramble.battery.DefaultBatteryManagerModule
import
org.briarproject.bramble.event.DefaultEventExecutorModule
import
org.briarproject.bramble.network.JavaNetworkModule
import
org.briarproject.bramble.plugin.tor.CircumventionModule
import
org.briarproject.bramble.plugin.tor.UnixTorPluginFactory
...
...
@@ -33,6 +36,7 @@ import org.briarproject.briar.desktop.viewmodel.ViewModelModule
import
java.io.File
import
java.nio.file.Path
import
java.util.Collections.emptyList
import
java.util.concurrent.Executor
import
javax.inject.Singleton
@Module
(
...
...
@@ -41,7 +45,6 @@ import javax.inject.Singleton
CircumventionModule
::
class
,
ClockModule
::
class
,
DefaultBatteryManagerModule
::
class
,
DefaultEventExecutorModule
::
class
,
DefaultTaskSchedulerModule
::
class
,
DefaultWakefulIoExecutorModule
::
class
,
DesktopSecureRandomModule
::
class
,
...
...
@@ -69,6 +72,13 @@ internal class DesktopModule(
return
DesktopDatabaseConfig
(
dbDir
,
keyDir
)
}
@Provides
@Singleton
@EventExecutor
fun
provideEventExecutor
():
Executor
{
return
Dispatchers
.
Swing
.
asExecutor
()
}
@Provides
@TorDirectory
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