Dan Ballard pushed to branch tor-browser-153.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 5fac2896 by clairehurst at 2026-08-10T14:56:50-07:00 fixup! [android] Disable features and functionality Bug 45098: Remove share link button - - - - - 3 changed files: - mobile/android/android-components/components/compose/browser-toolbar/src/main/java/mozilla/components/compose/browser/toolbar/ActionContainer.kt - mobile/android/android-components/components/compose/browser-toolbar/src/main/java/mozilla/components/compose/browser/toolbar/concept/Action.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddleware.kt Changes: ===================================== mobile/android/android-components/components/compose/browser-toolbar/src/main/java/mozilla/components/compose/browser/toolbar/ActionContainer.kt ===================================== @@ -37,6 +37,8 @@ import mozilla.components.compose.browser.toolbar.ui.TabCounter import mozilla.components.compose.browser.toolbar.ui.ActionButton as ActionButtonComposable import mozilla.components.ui.icons.R as iconsR +import mozilla.components.compose.browser.toolbar.concept.NoopAction + /** * A container for displaying [Action]s. * @@ -122,6 +124,8 @@ fun ActionContainer( ) } } + + else -> NoopAction() } } } ===================================== mobile/android/android-components/components/compose/browser-toolbar/src/main/java/mozilla/components/compose/browser/toolbar/concept/Action.kt ===================================== @@ -189,3 +189,5 @@ sealed class Action { val onClick: BrowserToolbarInteraction, ) : Action() } + +class NoopAction : Action() ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddleware.kt ===================================== @@ -143,6 +143,8 @@ import mozilla.components.lib.state.Action as MVIAction import mozilla.components.ui.icons.R as iconsR import mozilla.components.ui.tabcounter.R as tabcounterR +import mozilla.components.compose.browser.toolbar.concept.NoopAction + @VisibleForTesting internal sealed class DisplayActions(override val source: Source) : BrowserToolbarEvent { data class MenuClicked(override val source: Source) : DisplayActions(source) @@ -1318,17 +1320,13 @@ class BrowserToolbarMiddleware( ) } - ToolbarAction.Share -> ActionButtonRes( - drawableResId = iconsR.drawable.mozac_ic_share_android_24, - contentDescription = R.string.browser_menu_share, - onClick = ShareClicked(source), - ) - ToolbarAction.Homepage -> ActionButtonRes( drawableResId = iconsR.drawable.mozac_ic_home_24, contentDescription = R.string.browser_menu_homepage, onClick = HomepageClicked(source), ) + + else -> NoopAction() } private fun buildSiteInfoAction( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5fac2896... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5fac2896... 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)