From 9353b6d87e029695eb62bbad63591208fb7509e6 Mon Sep 17 00:00:00 2001
From: William Durand <will+git@drnd.me>
Date: Wed, 27 Sep 2023 23:17:23 +0200
Subject: [PATCH] Bug 1855516 - Call `disableExtensionProcessSpawning()` when
 the user clicks the "continue without add-ons" button

---
 .../fenix/addons/ExtensionProcessDisabledController.kt        | 4 +++-
 .../fenix/addons/ExtensionProcessDisabledControllerTest.kt    | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/addons/ExtensionProcessDisabledController.kt b/app/src/main/java/org/mozilla/fenix/addons/ExtensionProcessDisabledController.kt
index 4d85768c22..65466426ea 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/ExtensionProcessDisabledController.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/ExtensionProcessDisabledController.kt
@@ -53,10 +53,11 @@ class ExtensionProcessDisabledController(
          * Present a dialog to the user notifying of extension process spawning disabled and also asking
          * whether they would like to continue trying or disable extensions. If the user chooses to retry,
          * enable the extension process spawning with [WebExtensionController.enableExtensionProcessSpawning].
+         * Otherwise, call [WebExtensionController.disableExtensionProcessSpawning].
          *
          * @param context to show the AlertDialog
          * @param store The [BrowserStore] which holds the state for showing the dialog
-         * @param webExtensionController to call when a user enables the process spawning
+         * @param webExtensionController to call when the user enables or disables the process spawning
          * @param builder to use for creating the dialog which can be styled as needed
          * @param appName to be added to the message. Necessary to be added as a param for testing
          */
@@ -84,6 +85,7 @@ class ExtensionProcessDisabledController(
                     onDismissDialog?.invoke()
                 }
                 findViewById<Button>(R.id.negative)?.setOnClickListener {
+                    engine.disableExtensionProcessSpawning()
                     Addons.extensionsProcessUiDisable.add()
                     store.dispatch(ExtensionProcessDisabledPopupAction(false))
                     onDismissDialog?.invoke()
diff --git a/app/src/test/java/org/mozilla/fenix/addons/ExtensionProcessDisabledControllerTest.kt b/app/src/test/java/org/mozilla/fenix/addons/ExtensionProcessDisabledControllerTest.kt
index 315978e13c..819ff80f05 100644
--- a/app/src/test/java/org/mozilla/fenix/addons/ExtensionProcessDisabledControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/addons/ExtensionProcessDisabledControllerTest.kt
@@ -63,6 +63,7 @@ class ExtensionProcessDisabledControllerTest {
         store.waitUntilIdle()
 
         verify(engine).enableExtensionProcessSpawning()
+        verify(engine, never()).disableExtensionProcessSpawning()
         assertFalse(store.state.showExtensionProcessDisabledPopup)
         verify(dialog).dismiss()
     }
@@ -97,6 +98,7 @@ class ExtensionProcessDisabledControllerTest {
 
         assertFalse(store.state.showExtensionProcessDisabledPopup)
         verify(engine, never()).enableExtensionProcessSpawning()
+        verify(engine).disableExtensionProcessSpawning()
         verify(dialog).dismiss()
     }