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

Commits: 8031e181 by Alex Catarineu at 2020-10-15T13:11:10+02:00 fixup! Bug 40058: Hide option for disallowing addon in private mode

Fixes #40086: Disabling/Enabling addon still shows option to disallow in private mode.

- - - - - 53ea7a05 by Alex Catarineu at 2020-10-15T17:30:46+02:00 fixup! Bug 40028: Implement Tor Service controller

Part of #40078 fix.

- - - - - 10fcc45a by Matthew Finkel at 2020-10-15T20:41:28+00:00 Merge remote-tracking branch 'acatgl/40078+1' into tor-browser-82.0.0b4-10.0-1

- - - - - 15968de0 by Matthew Finkel at 2020-10-15T20:42:44+00:00 Merge remote-tracking branch 'acatgl/40086' into tor-browser-82.0.0b4-10.0-1

- - - - -

2 changed files:

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

Changes:

===================================== app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt ===================================== @@ -113,7 +113,7 @@ class InstalledAddonDetailsFragment : Fragment() { runIfFragmentIsAttached { this.addon = it switch.isClickable = true - privateBrowsingSwitch.isVisible = it.isEnabled() + privateBrowsingSwitch.isVisible = false privateBrowsingSwitch.isChecked = it.isAllowedInPrivateBrowsing() switch.setText(R.string.mozac_feature_addons_enabled) view.settings.isVisible = shouldSettingsBeVisible()

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

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