tor-browser

commit fbe97d16ca8e3a7b84e7a1da8a185ccbd596c48f
parent 7ab53d075f934d409399c72db9900ff541b4a680
Author: Dan Ballard <dan@mindstab.net>
Date:   Mon, 19 Jan 2026 17:50:43 -0800

fixup! [android] Implement Android-native Connection Assist UI

Bug 43645: wire in call to shutdown tor process onDestroy

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
 | 
2
++
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt
 | 
1
+
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt
 | 
4
++++

3 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -184,6 +184,7 @@ import mozilla.components.browser.engine.gecko.GeckoEngine
 import org.mozilla.fenix.compose.core.Action
 import org.mozilla.fenix.compose.snackbar.SnackbarState
 import org.mozilla.fenix.compose.snackbar.Snackbar
+import org.mozilla.fenix.tor.TorController
 import org.mozilla.fenix.tor.UrlQuickLoadViewModel
 import org.mozilla.geckoview.TorAndroidIntegration.BootstrapStateChangeListener
 import org.mozilla.geckoview.TorConnectStage
@@ -1584,6 +1585,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
 
     fun shutDown() : Nothing {
         finishAndRemoveTask()
+        components.torController.shutdown()
         exitProcess(0)
     }
 }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt
@@ -38,4 +38,5 @@ interface TorController {
 
     fun initiateTorBootstrap(lifecycleScope: LifecycleCoroutineScope? = null, withDebugLogging: Boolean = false)
     fun stopTor()
+    fun shutdown()
 }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt
@@ -175,6 +175,10 @@ class TorControllerGV(
         getTorIntegration().cancelBootstrap()
     }
 
+    override fun shutdown() {
+        getTorIntegration().shutdown()
+    }
+
     // TorEventsBootstrapStateChangeListener
     override fun onBootstrapStageChange(stage: TorConnectStage) {
         Log.d(TAG, "onBootstrapStageChange(stage = $stage)")