brizental pushed to branch tor-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 2bd61ad7 by Beatriz Rizental at 2025-10-02T01:22:22+02:00 fixup! TB 34403 [android]: Disable Normal mode by default. Hide option to open bookmarks in normal mode. - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksScreen.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksScreen.kt ===================================== @@ -64,6 +64,7 @@ import androidx.compose.ui.semantics.testTag import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp +import androidx.compose.ui.platform.LocalContext import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost @@ -88,6 +89,7 @@ import org.mozilla.fenix.compose.list.SelectableIconListItem import org.mozilla.fenix.compose.snackbar.AcornSnackbarHostState import org.mozilla.fenix.compose.snackbar.SnackbarHost import org.mozilla.fenix.compose.snackbar.SnackbarState +import org.mozilla.fenix.ext.settings import org.mozilla.fenix.library.bookmarks.BookmarksTestTag.ADD_BOOKMARK_FOLDER_NAME_TEXT_FIELD import org.mozilla.fenix.library.bookmarks.BookmarksTestTag.EDIT_BOOKMARK_ITEM_TITLE_TEXT_FIELD import org.mozilla.fenix.library.bookmarks.BookmarksTestTag.EDIT_BOOKMARK_ITEM_URL_TEXT_FIELD @@ -883,7 +885,7 @@ private fun BookmarkListOverflowMenu( onDismissRequest: () -> Unit, store: BookmarksStore, ) { - val menuItems = listOf( + val menuItems = listOfNotNull( MenuItem( title = stringResource(R.string.bookmark_menu_select_all_bookmarks), onClick = { store.dispatch(BookmarksListMenuAction.SelectAll) }, @@ -891,7 +893,7 @@ private fun BookmarkListOverflowMenu( MenuItem( title = stringResource(R.string.bookmark_menu_open_in_new_tab_button), onClick = { store.dispatch(BookmarksListMenuAction.MultiSelect.OpenInNormalTabsClicked) }, - ), + ).takeIf { !LocalContext.current.settings().shouldDisableNormalMode }, MenuItem( title = stringResource(R.string.bookmark_menu_open_in_private_tab_button), onClick = { store.dispatch(BookmarksListMenuAction.MultiSelect.OpenInPrivateTabsClicked) }, @@ -921,7 +923,7 @@ private fun BookmarkListItemMenu( bookmark: BookmarkItem.Bookmark, store: BookmarksStore, ) { - val menuItems = listOf( + val menuItems = listOfNotNull( MenuItem( title = stringResource(R.string.bookmark_menu_edit_button), onClick = { store.dispatch(BookmarksListMenuAction.Bookmark.EditClicked(bookmark)) }, @@ -937,7 +939,7 @@ private fun BookmarkListItemMenu( MenuItem( title = stringResource(R.string.bookmark_menu_open_in_new_tab_button), onClick = { store.dispatch(BookmarksListMenuAction.Bookmark.OpenInNormalTabClicked(bookmark)) }, - ), + ).takeIf { !LocalContext.current.settings().shouldDisableNormalMode }, MenuItem( title = stringResource(R.string.bookmark_menu_open_in_private_tab_button), onClick = { store.dispatch(BookmarksListMenuAction.Bookmark.OpenInPrivateTabClicked(bookmark)) }, @@ -963,7 +965,7 @@ private fun BookmarkListFolderMenu( folder: BookmarkItem.Folder, store: BookmarksStore, ) { - val menuItems = listOf( + val menuItems = listOfNotNull( MenuItem( title = stringResource(R.string.bookmark_menu_edit_button), onClick = { store.dispatch(BookmarksListMenuAction.Folder.EditClicked(folder)) }, @@ -971,7 +973,7 @@ private fun BookmarkListFolderMenu( MenuItem( title = stringResource(R.string.bookmark_menu_open_all_in_tabs_button), onClick = { store.dispatch(BookmarksListMenuAction.Folder.OpenAllInNormalTabClicked(folder)) }, - ), + ).takeIf { !LocalContext.current.settings().shouldDisableNormalMode }, MenuItem( title = stringResource(R.string.bookmark_menu_open_all_in_private_tabs_button), onClick = { store.dispatch(BookmarksListMenuAction.Folder.OpenAllInPrivateTabClicked(folder)) }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2bd61ad7... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2bd61ad7... You're receiving this email because of your account on gitlab.torproject.org.