Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix

Commits: bf824c0f by Matthew Finkel at 2020-09-30T12:54:41+00:00 fixup! Bug 40028: Implement Tor Service controller

Bug 40040: Try avoiding a race condition when starting Tor

This does not prevent the race, but this increases the chances that the two racing operations do not happen in parallel.

- - - - - 29abadbb by Matthew Finkel at 2020-09-30T22:03:40+00:00 Merge branch 'bug_40040_01' into tor-browser-81.1.1-10.0-1

- - - - -

1 changed file:

- app/src/main/java/org/mozilla/fenix/tor/TorController.kt

Changes:

===================================== app/src/main/java/org/mozilla/fenix/tor/TorController.kt ===================================== @@ -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(

View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/294a617bf9906...