Firefox · Core
CVE-2025-9186
Logic Error in Core
Overview
Low
Severity
—
CVSS
No
Exploited ITW
Fixed
Fix Status
Files Changed
mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/BrowserToolbarIntegration.ktmobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/BrowserFragment.kt
Patch
diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/BrowserToolbarIntegration.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/BrowserToolbarIntegration.kt
index 2fa0fadc7f7..03c3f0ca59e 100644
--- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/BrowserToolbarIntegration.kt
+++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/BrowserToolbarIntegration.kt
@@ -69,6 +69,7 @@ class BrowserToolbarIntegration(
private val tabCounterListener: () -> Unit,
private val customTabId: String? = null,
isOnboardingTab: Boolean = false,
+ renderStyle: ToolbarFeature.RenderStyle,
) : LifecycleAwareFeature {
private val presenter = ToolbarPresenter(
toolbar,
@@ -78,7 +79,7 @@ class BrowserToolbarIntegration(
toolbar.context.components.publicSuffixList,
ContextCompat.getColor(toolbar.context, R.color.primaryText),
ContextCompat.getColor(toolbar.context, R.color.secondaryText),
- ToolbarFeature.RenderStyle.ColoredUrl,
+ renderStyle,
),
)
diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/BrowserFragment.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/BrowserFragment.kt
index 09473cec833..cffaa04b086 100644
--- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/BrowserFragment.kt
+++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/BrowserFragment.kt
@@ -60,6 +60,7 @@ import mozilla.components.feature.session.PictureInPictureFeature
import mozilla.components.feature.session.SessionFeature
import mozilla.components.feature.sitepermissions.SitePermissionsFeature
import mozilla.components.feature.tabs.WindowFeature
+import mozilla.components.feature.toolbar.ToolbarFeature
import mozilla.components.feature.top.sites.TopSitesConfig
import mozilla.components.feature.top.sites.TopSitesFeature
import mozilla.components.lib.crash.Crash
@@ -584,6 +585,12 @@ class BrowserFragment :
binding.browserToolbar.display.menuBuilder = browserMenu.menuBuilder
}
+ val renderStyle = if (tab.isCustomTab()) {
+ ToolbarFeature.RenderStyle.RegistrableDomain
+ } else {
+ ToolbarFeature.RenderStyle.ColoredUrl
+ }
+
toolbarIntegration.set(
BrowserToolbarIntegration(
requireComponents.store,
@@ -597,6 +604,7 @@ class BrowserFragment :
eraseActionListener = { erase(shouldEraseAllTabs = true) },
isOnboardingTab = isOnboardingTab(customTabSessionState),
tabCounterListener = ::tabCounterListener,
+ renderStyle = renderStyle,
),
owner = this,
view = binding.browserToolbar,
Loading diff…
References
On This Page