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
7e7a2f8d
Commit
7e7a2f8d
authored
Oct 15, 2020
by
Alex Catarineu
Browse files
Revert "fixup! Bug 40028: Implement Tor Service controller"
This reverts commit
83988eba
.
parent
afd84475
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/org/mozilla/fenix/tor/TorController.kt
View file @
7e7a2f8d
...
...
@@ -119,6 +119,13 @@ 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
(
...
...
@@ -129,8 +136,6 @@ class TorController(
persistentBroadcastReceiver
,
IntentFilter
(
TorServiceConstants
.
LOCAL_ACTION_LOG
)
)
val
torServiceStatus
=
Intent
(
context
,
TorService
::
class
.
java
)
context
.
startService
(
torServiceStatus
)
}
fun
stop
()
{
...
...
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