Skip to content

Update Android Components to 20260518093736 and handle breaking changes #4307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonalmeida merged 1 commit into from
May 18, 2026
Merged

Update Android Components to 20260518093736 and handle breaking changes #4307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionPromptFeature.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Copy link
Copy Markdown
Contributor Author

@Mugurell Mugurell May 18, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replaced the exhaustive when check with a simpler if check here
Since there is no immediate plan to support WebExtensionPromptRequest.InstallationRequested in RB also.

Future WebExtensionPromptRequest changes will need to be handled in the below handlePermissions so new changes will require thinking about how to handle them in RB so this change will not lead to ignoring all future updates.

handleAfterInstallationRequest(promptRequest)
}

is WebExtensionPromptRequest.BeforeInstallation.InstallationFailed -> {
if (promptRequest is WebExtensionPromptRequest.BeforeInstallation.InstallationFailed) {
handleBeforeInstallationRequest(promptRequest)
consumePromptRequest()
}
}
}
}
tryToReAttachButtonHandlersToPreviousDialog()
}
Expand Down Expand Up @@ -241,6 +239,10 @@ class WebExtensionPromptFeature(
promptRequest.onConfirm(response)
}

is WebExtensionPromptRequest.InstallationRequested -> {
// opt-out
}

is WebExtensionPromptRequest.AfterInstallation.PostInstallation -> {
// opt-out
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/mozilla/reference/browser/browser/CustomTabsIntegration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/mozilla/reference/browser/browser/ToolbarIntegration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Copy link
Copy Markdown
Contributor Author

@Mugurell Mugurell May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same change as for Fenix - https://phabricator.services.mozilla.com/D300519

tint = tint,
),
) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_installed_add_on_details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Copy Markdown
Contributor Author

@Mugurell Mugurell May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same change as for Fenix - https://phabricator.services.mozilla.com/D300514

app:drawableTint="@color/icons" />

<TextView
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_browser.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:src="@drawable/mozac_ic_font"
android:src="@drawable/mozac_ic_reader_view_24"
Copy link
Copy Markdown
Contributor Author

@Mugurell Mugurell May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same change as for Fenix - https://phabricator.services.mozilla.com/D300515

android:contentDescription="@string/reader_view_appearance_button"
android:visibility="gone"
android:layout_marginRight="16dp"
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
# Android Components
android-components = "152.0.20260513094209"
android-components = "152.0.20260518093736"

# AGP
android-gradle-plugin = "9.2.1"
Expand Down