[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-153.0esr-16.0-1] fixup! TB 40015: [android] Port padlock states for .onion services

Title: GitLab

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:

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
    76 76 
     import mozilla.components.support.ktx.kotlin.applyRegistrableDomainSpan
    77 77 
     import mozilla.components.support.ktx.kotlin.getOrigin
    78 78 
     import mozilla.components.support.ktx.kotlin.isContentUrl
    79 
    +import mozilla.components.support.ktx.kotlin.isOnionUrl
    79 80 
     import mozilla.components.support.ktx.kotlin.isUrl
    80 81 
     import mozilla.components.support.ktx.util.URLStringUtils
    81 82 
     import mozilla.components.support.utils.ClipboardHandler
    ... ... @@ -1273,19 +1274,26 @@ class BrowserToolbarMiddleware(
    1273 1274 
                         onClick = object : BrowserToolbarEvent {},
    1274 1275 
                     )
    1275 1276 
                 } else if (
    1276 
    -                selectedTab.content.securityInfo.isSecure &&
    1277 
    -                selectedTab.trackingProtection.enabled &&
    1278 
    -                !selectedTab.trackingProtection.ignoredOnTrackingProtection
    1277 
    +                selectedTab.content.securityInfo.isSecure
    1279 1278 
                 ) {
    1280 
    -                buildSiteInfoAction(
    1281 
    -                    drawableResId = iconsR.drawable.mozac_ic_shield_checkmark_24,
    1282 
    -                    contentDescription = toolbarR.string.mozac_browser_toolbar_content_description_site_info,
    1283 
    -                    highlighted = highlight,
    1284 
    -                    onClick = StartPageActions.SiteInfoClicked,
    1285 
    -                )
    1279 
    +                if (selectedTab.content.url.isOnionUrl()) {
    1280 
    +                    buildSiteInfoAction(
    1281 
    +                        drawableResId = iconsR.drawable.mozac_ic_onion,
    1282 
    +                        contentDescription = toolbarR.string.mozac_browser_toolbar_content_description_site_info,
    1283 
    +                        highlighted = highlight,
    1284 
    +                        onClick = StartPageActions.SiteInfoClicked,
    1285 
    +                    )
    1286 
    +                } else {
    1287 
    +                    buildSiteInfoAction(
    1288 
    +                        drawableResId = iconsR.drawable.mozac_ic_lock_24,
    1289 
    +                        contentDescription = toolbarR.string.mozac_browser_toolbar_content_description_site_info,
    1290 
    +                        highlighted = highlight,
    1291 
    +                        onClick = StartPageActions.SiteInfoClicked,
    1292 
    +                    )
    1293 
    +                }
    1286 1294 
                 } else {
    1287 1295 
                     buildSiteInfoAction(
    1288 
    -                    drawableResId = iconsR.drawable.mozac_ic_shield_slash_24,
    1296 
    +                    drawableResId = iconsR.drawable.mozac_ic_lock_slash_critical_24,
    1289 1297 
                         contentDescription = toolbarR.string.mozac_browser_toolbar_content_description_site_info,
    1290 1298 
                         highlighted = highlight,
    1291 1299 
                         onClick = StartPageActions.SiteInfoClicked,

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/323fa639a3b43ca6623ed50186f85553feb64749 at 1785267032 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx