Bug 1852335 - Renamed WebExtensionPopupFeature and ExtensionProcessDisabledPopupFeature to observers

fenix/119.0
Zac McKenney 9 months ago committed by mergify[bot]
parent 3f9d00be84
commit 079347af06

@ -80,7 +80,7 @@ import mozilla.components.support.utils.BrowsersCache
import mozilla.components.support.utils.ManufacturerCodes
import mozilla.components.support.utils.SafeIntent
import mozilla.components.support.utils.toSafeIntent
import mozilla.components.support.webextensions.WebExtensionPopupFeature
import mozilla.components.support.webextensions.WebExtensionPopupObserver
import mozilla.telemetry.glean.private.NoExtras
import org.mozilla.experiments.nimbus.initializeTooling
import org.mozilla.fenix.GleanMetrics.AppIcon
@ -190,11 +190,11 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
private var isToolbarInflated = false
private val webExtensionPopupFeature by lazy {
WebExtensionPopupFeature(components.core.store, ::openPopup)
private val webExtensionPopupObserver by lazy {
WebExtensionPopupObserver(components.core.store, ::openPopup)
}
private val extensionProcessDisabledPopupFeature by lazy {
private val extensionProcessDisabledPopupObserver by lazy {
ExtensionProcessDisabledController(this@HomeActivity, components.core.store)
}
@ -346,7 +346,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
}
supportActionBar?.hide()
lifecycle.addObservers(webExtensionPopupFeature, extensionProcessDisabledPopupFeature, serviceWorkerSupport)
lifecycle.addObservers(webExtensionPopupObserver, extensionProcessDisabledPopupObserver, serviceWorkerSupport)
if (shouldAddToRecentsScreen(intent)) {
intent.removeExtra(START_IN_RECENTS_SCREEN)

@ -11,7 +11,7 @@ import mozilla.components.browser.state.action.ExtensionProcessDisabledPopupActi
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 mozilla.components.support.webextensions.ExtensionProcessDisabledPopupObserver
import org.mozilla.fenix.GleanMetrics.Addons
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.components
@ -72,7 +72,7 @@ class ExtensionProcessDisabledController(
engine: Engine = context.components.core.engine,
builder: AlertDialog.Builder = AlertDialog.Builder(context),
appName: String = context.appName,
) : ExtensionProcessDisabledPopupFeature(
) : ExtensionProcessDisabledPopupObserver(
store,
{ presentDialog(context, store, engine, builder, appName) },
)

Loading…
Cancel
Save