Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Alex Catarineu
fenix
Commits
83988eba
Commit
83988eba
authored
Oct 15, 2020
by
Alex Catarineu
Browse files
fixup! Bug 40028: Implement Tor Service controller
Part of #40078 fix.
parent
460d5891
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/org/mozilla/fenix/tor/TorController.kt
View file @
83988eba
...
...
@@ -119,13 +119,6 @@ class TorController(
Prefs
.
setBridgesList
(
value
)
}
init
{
// Bug 40040: Hacky: Initialize TorService when we are instantiated. This should
// help avoid a race condition involving copying assets and starting tor in TorService.
val
torServiceStatus
=
Intent
(
context
,
TorService
::
class
.
java
)
context
.
startService
(
torServiceStatus
)
}
fun
start
()
{
// Register receiver
lbm
.
registerReceiver
(
...
...
@@ -136,6 +129,8 @@ class TorController(
persistentBroadcastReceiver
,
IntentFilter
(
TorServiceConstants
.
LOCAL_ACTION_LOG
)
)
val
torServiceStatus
=
Intent
(
context
,
TorService
::
class
.
java
)
context
.
startService
(
torServiceStatus
)
}
fun
stop
()
{
...
...
Alex Catarineu
@acat
mentioned in commit
7e7a2f8d
·
Oct 15, 2020
mentioned in commit
7e7a2f8d
mentioned in commit 7e7a2f8d42d90a3e5a4042e732cdc43670aba4e3
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment