Merge pull request #3513 from mozilla-mobile/mergify/bp/releases_v118/pr-3472
Bug 1846979 - Add extensions process spawning disabled dialog (backport #3472)fenix/118.0
Pascal Chevrel
9 months ago
committed by
GitHub
commit
675b8fc42c
@ -0,0 +1,78 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package org.mozilla.fenix.addons
|
||||
|
||||
import android.app.AlertDialog
|
||||
import android.content.Context
|
||||
import androidx.annotation.UiContext
|
||||
import mozilla.components.browser.state.action.ExtensionProcessDisabledPopupAction
|
||||
import mozilla.components.browser.state.store.BrowserStore
|
||||
import mozilla.components.concept.engine.Engine
|
||||
import mozilla.components.support.ktx.android.content.appName
|
||||
import mozilla.components.support.webextensions.ExtensionProcessDisabledPopupFeature
|
||||
import org.mozilla.fenix.GleanMetrics.Addons
|
||||
import org.mozilla.fenix.R
|
||||
import org.mozilla.fenix.ext.components
|
||||
import org.mozilla.geckoview.WebExtensionController
|
||||
|
||||
/**
|
||||
* 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].
|
||||
*
|
||||
* @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 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
|
||||
*/
|
||||
private fun presentDialog(
|
||||
@UiContext context: Context,
|
||||
store: BrowserStore,
|
||||
engine: Engine,
|
||||
builder: AlertDialog.Builder,
|
||||
appName: String,
|
||||
) {
|
||||
val message = context.getString(R.string.addon_process_crash_dialog_message, appName)
|
||||
|
||||
builder.apply {
|
||||
setCancelable(false)
|
||||
setTitle(R.string.addon_process_crash_dialog_title)
|
||||
setMessage(message)
|
||||
setPositiveButton(R.string.addon_process_crash_dialog_retry_button_text) { dialog, _ ->
|
||||
engine.enableExtensionProcessSpawning()
|
||||
Addons.extensionsProcessUiRetry.add()
|
||||
store.dispatch(ExtensionProcessDisabledPopupAction(false))
|
||||
dialog.dismiss()
|
||||
}
|
||||
setNegativeButton(R.string.addon_process_crash_dialog_disable_addons_button_text) { dialog, _ ->
|
||||
Addons.extensionsProcessUiDisable.add()
|
||||
store.dispatch(ExtensionProcessDisabledPopupAction(false))
|
||||
dialog.dismiss()
|
||||
}
|
||||
}
|
||||
|
||||
builder.show()
|
||||
}
|
||||
|
||||
/**
|
||||
* Controller for showing the user a dialog when the the extension process spawning has been disabled.
|
||||
*
|
||||
* @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 builder to use for creating the dialog which can be styled as needed
|
||||
* @param appName to be added to the message. Optional and mainly relevant for testing
|
||||
*/
|
||||
class ExtensionProcessDisabledController(
|
||||
@UiContext context: Context,
|
||||
store: BrowserStore,
|
||||
engine: Engine = context.components.core.engine,
|
||||
builder: AlertDialog.Builder = AlertDialog.Builder(context, R.style.DialogStyleNormal),
|
||||
appName: String = context.appName,
|
||||
) : ExtensionProcessDisabledPopupFeature(
|
||||
store,
|
||||
{ presentDialog(context, store, engine, builder, appName) },
|
||||
)
|
||||
@ -0,0 +1,104 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package org.mozilla.fenix.addons
|
||||
|
||||
import android.app.AlertDialog
|
||||
import android.content.Context
|
||||
import android.content.DialogInterface.OnClickListener
|
||||
import mozilla.components.browser.state.action.ExtensionProcessDisabledPopupAction
|
||||
import mozilla.components.browser.state.store.BrowserStore
|
||||
import mozilla.components.concept.engine.Engine
|
||||
import mozilla.components.support.test.argumentCaptor
|
||||
import mozilla.components.support.test.libstate.ext.waitUntilIdle
|
||||
import mozilla.components.support.test.rule.MainCoroutineRule
|
||||
import mozilla.components.support.test.whenever
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.mockito.Mockito.anyInt
|
||||
import org.mockito.Mockito.anyString
|
||||
import org.mockito.Mockito.mock
|
||||
import org.mockito.Mockito.never
|
||||
import org.mockito.Mockito.times
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
||||
|
||||
@RunWith(FenixRobolectricTestRunner::class)
|
||||
class ExtensionProcessDisabledControllerTest {
|
||||
|
||||
@get:Rule
|
||||
val coroutinesTestRule = MainCoroutineRule()
|
||||
private val dispatcher = coroutinesTestRule.testDispatcher
|
||||
|
||||
@Test
|
||||
fun `WHEN showExtensionProcessDisabledPopup is true AND positive button clicked then enable extension process spawning`() {
|
||||
val context: Context = mock()
|
||||
val store = BrowserStore()
|
||||
val engine: Engine = mock()
|
||||
val appName = "TestApp"
|
||||
val builder: AlertDialog.Builder = mock()
|
||||
val controller = ExtensionProcessDisabledController(context, store, engine, builder, appName)
|
||||
controller.start()
|
||||
|
||||
whenever(context.getString(anyInt(), anyString())).thenReturn("TestString")
|
||||
|
||||
val posClickCaptor = argumentCaptor<OnClickListener>()
|
||||
|
||||
assertFalse(store.state.showExtensionProcessDisabledPopup)
|
||||
|
||||
store.dispatch(ExtensionProcessDisabledPopupAction(showPopup = true))
|
||||
dispatcher.scheduler.advanceUntilIdle()
|
||||
store.waitUntilIdle()
|
||||
assertTrue(store.state.showExtensionProcessDisabledPopup)
|
||||
|
||||
verify(builder).setPositiveButton(anyInt(), posClickCaptor.capture())
|
||||
|
||||
verify(builder).show()
|
||||
|
||||
val dialog: AlertDialog = mock()
|
||||
posClickCaptor.value.onClick(dialog, 1)
|
||||
store.waitUntilIdle()
|
||||
|
||||
verify(engine).enableExtensionProcessSpawning()
|
||||
assertFalse(store.state.showExtensionProcessDisabledPopup)
|
||||
verify(dialog).dismiss()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `WHEN showExtensionProcessDisabledPopup is true AND negative button clicked then dismiss without enabling extension process spawning`() {
|
||||
val context: Context = mock()
|
||||
val store = BrowserStore()
|
||||
val engine: Engine = mock()
|
||||
val appName = "TestApp"
|
||||
val builder: AlertDialog.Builder = mock()
|
||||
val controller = ExtensionProcessDisabledController(context, store, engine, builder, appName)
|
||||
controller.start()
|
||||
|
||||
whenever(context.getString(anyInt(), anyString())).thenReturn("TestString")
|
||||
|
||||
val negClickCaptor = argumentCaptor<OnClickListener>()
|
||||
|
||||
assertFalse(store.state.showExtensionProcessDisabledPopup)
|
||||
|
||||
store.dispatch(ExtensionProcessDisabledPopupAction(showPopup = true))
|
||||
dispatcher.scheduler.advanceUntilIdle()
|
||||
store.waitUntilIdle()
|
||||
assertTrue(store.state.showExtensionProcessDisabledPopup)
|
||||
|
||||
verify(builder).setNegativeButton(anyInt(), negClickCaptor.capture())
|
||||
|
||||
verify(builder).show()
|
||||
|
||||
val dialog: AlertDialog = mock()
|
||||
negClickCaptor.value.onClick(dialog, 1)
|
||||
store.waitUntilIdle()
|
||||
|
||||
assertFalse(store.state.showExtensionProcessDisabledPopup)
|
||||
verify(engine, never()).enableExtensionProcessSpawning()
|
||||
verify(dialog).dismiss()
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue