diff --git a/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionPromptFeature.kt b/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionPromptFeature.kt index 8e43dd82d..0d121e2d9 100644 --- a/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionPromptFeature.kt +++ b/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionPromptFeature.kt @@ -52,20 +52,18 @@ class WebExtensionPromptFeature( scope = store.flowScoped(dispatcher = mainDispatcher) { flow -> flow .mapNotNull { state -> - state.webExtensionPromptRequest - }.distinctUntilChanged() + state.webExtensionPromptRequest + }.distinctUntilChanged() .collect { promptRequest -> - when (promptRequest) { - is WebExtensionPromptRequest.AfterInstallation -> { + if (promptRequest is WebExtensionPromptRequest.AfterInstallation) { handleAfterInstallationRequest(promptRequest) } - is WebExtensionPromptRequest.BeforeInstallation.InstallationFailed -> { + if (promptRequest is WebExtensionPromptRequest.BeforeInstallation.InstallationFailed) { handleBeforeInstallationRequest(promptRequest) consumePromptRequest() } } - } } tryToReAttachButtonHandlersToPreviousDialog() } @@ -241,6 +239,10 @@ class WebExtensionPromptFeature( promptRequest.onConfirm(response) } + is WebExtensionPromptRequest.InstallationRequested -> { + // opt-out + } + is WebExtensionPromptRequest.AfterInstallation.PostInstallation -> { // opt-out } diff --git a/app/src/main/java/org/mozilla/reference/browser/browser/CustomTabsIntegration.kt b/app/src/main/java/org/mozilla/reference/browser/browser/CustomTabsIntegration.kt index 9de49a46a..345ed2ad4 100644 --- a/app/src/main/java/org/mozilla/reference/browser/browser/CustomTabsIntegration.kt +++ b/app/src/main/java/org/mozilla/reference/browser/browser/CustomTabsIntegration.kt @@ -90,7 +90,7 @@ class CustomTabsIntegration( contentDescription = "Stop", icon = DrawableMenuIcon( context, - mozilla.components.ui.icons.R.drawable.mozac_ic_stop, + mozilla.components.ui.icons.R.drawable.mozac_ic_cross_24, tint = tint, ), ) { diff --git a/app/src/main/java/org/mozilla/reference/browser/browser/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/reference/browser/browser/ToolbarIntegration.kt index 473ddc916..c7ff72280 100644 --- a/app/src/main/java/org/mozilla/reference/browser/browser/ToolbarIntegration.kt +++ b/app/src/main/java/org/mozilla/reference/browser/browser/ToolbarIntegration.kt @@ -97,7 +97,7 @@ class ToolbarIntegration( contentDescription = "Stop", icon = DrawableMenuIcon( context, - mozilla.components.ui.icons.R.drawable.mozac_ic_stop, + mozilla.components.ui.icons.R.drawable.mozac_ic_cross_24, tint = tint, ), ) { diff --git a/app/src/main/res/layout/activity_installed_add_on_details.xml b/app/src/main/res/layout/activity_installed_add_on_details.xml index 169930790..268b6dcd2 100644 --- a/app/src/main/res/layout/activity_installed_add_on_details.xml +++ b/app/src/main/res/layout/activity_installed_add_on_details.xml @@ -39,7 +39,7 @@ android:padding="16dp" android:text="@string/mozac_feature_addons_settings" android:textSize="18sp" - app:drawableStartCompat="@drawable/mozac_ic_preferences" + app:drawableStartCompat="@drawable/mozac_ic_settings_24" app:drawableTint="@color/icons" />