Dan Ballard pushed to branch tor-browser-153.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 323fa639 by clairehurst at 2026-07-28T12:28:57-07:00 fixup! TB 40015: [android] Port padlock states for .onion services Bug 45115: Fix site security icon for new toolbar - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddleware.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddleware.kt ===================================== @@ -76,6 +76,7 @@ import mozilla.components.support.base.log.logger.Logger import mozilla.components.support.ktx.kotlin.applyRegistrableDomainSpan import mozilla.components.support.ktx.kotlin.getOrigin import mozilla.components.support.ktx.kotlin.isContentUrl +import mozilla.components.support.ktx.kotlin.isOnionUrl import mozilla.components.support.ktx.kotlin.isUrl import mozilla.components.support.ktx.util.URLStringUtils import mozilla.components.support.utils.ClipboardHandler @@ -1273,19 +1274,26 @@ class BrowserToolbarMiddleware( onClick = object : BrowserToolbarEvent {}, ) } else if ( - selectedTab.content.securityInfo.isSecure && - selectedTab.trackingProtection.enabled && - !selectedTab.trackingProtection.ignoredOnTrackingProtection + selectedTab.content.securityInfo.isSecure ) { - buildSiteInfoAction( - drawableResId = iconsR.drawable.mozac_ic_shield_checkmark_24, - contentDescription = toolbarR.string.mozac_browser_toolbar_content_description_site_info, - highlighted = highlight, - onClick = StartPageActions.SiteInfoClicked, - ) + if (selectedTab.content.url.isOnionUrl()) { + buildSiteInfoAction( + drawableResId = iconsR.drawable.mozac_ic_onion, + contentDescription = toolbarR.string.mozac_browser_toolbar_content_description_site_info, + highlighted = highlight, + onClick = StartPageActions.SiteInfoClicked, + ) + } else { + buildSiteInfoAction( + drawableResId = iconsR.drawable.mozac_ic_lock_24, + contentDescription = toolbarR.string.mozac_browser_toolbar_content_description_site_info, + highlighted = highlight, + onClick = StartPageActions.SiteInfoClicked, + ) + } } else { buildSiteInfoAction( - drawableResId = iconsR.drawable.mozac_ic_shield_slash_24, + drawableResId = iconsR.drawable.mozac_ic_lock_slash_critical_24, contentDescription = toolbarR.string.mozac_browser_toolbar_content_description_site_info, highlighted = highlight, onClick = StartPageActions.SiteInfoClicked, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/323fa639... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/323fa639... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help
participants (1)
-
Dan Ballard (@dan)