Pier Angelo Vendrame pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: c02c67cc by clairehurst at 2025-08-27T14:29:06-06:00 fixup! TB 44098: [android] Disable sync tor-browser#44098 Bookmarks offer a way to go to sync in 15.0a1 - - - - - 5 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksAction.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksMiddleware.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksReducer.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksScreen.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksTelemetryMiddleware.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksAction.kt ===================================== @@ -82,7 +82,6 @@ internal data object SearchClicked : BookmarksAction internal data object AddFolderClicked : BookmarksAction internal data object CloseClicked : BookmarksAction internal data object BackClicked : BookmarksAction -internal data object SignIntoSyncClicked : BookmarksAction internal data class EditBookmarkClicked(val bookmark: BookmarkItem.Bookmark) : BookmarksAction internal data class ReceivedSyncSignInUpdate(val isSignedIn: Boolean) : BookmarksAction internal data object FirstSyncCompleted : BookmarksAction ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksMiddleware.kt ===================================== @@ -137,7 +137,6 @@ internal class BookmarksMiddleware( SearchClicked -> navigateToSearch() AddFolderClicked -> getNavController().navigate(BookmarksDestinations.ADD_FOLDER) CloseClicked -> exitBookmarks() - SignIntoSyncClicked -> navigateToSignIntoSync() is EditBookmarkClicked -> getNavController().navigate(BookmarksDestinations.EDIT_BOOKMARK) BackClicked -> { when { ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksReducer.kt ===================================== @@ -154,7 +154,6 @@ internal fun bookmarksReducer(state: BookmarksState, action: BookmarksAction) = ViewDisposed, SelectFolderAction.ViewAppeared, SearchClicked, - SignIntoSyncClicked, is InitEdit, Init, PrivateBrowsingAuthorized, ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksScreen.kt ===================================== @@ -824,38 +824,11 @@ private fun EmptyList( horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(16.dp), ) { - Image( - painter = painterResource(state.drawableId()), - contentDescription = null, - ) Text( text = stringResource(R.string.bookmark_empty_list_title), style = FirefoxTheme.typography.headline7, color = FirefoxTheme.colors.textPrimary, ) - Text( - text = stringResource(state.descriptionId()), - style = FirefoxTheme.typography.body2, - color = FirefoxTheme.colors.textPrimary, - textAlign = TextAlign.Center, - ) - if (state is EmptyListState.NotAuthenticated) { - TextButton( - onClick = { dispatcher(SignIntoSyncClicked) }, - colors = ButtonDefaults.buttonColors(backgroundColor = FirefoxTheme.colors.actionPrimary), - shape = RoundedCornerShape(4.dp), - modifier = Modifier - .heightIn(36.dp) - .fillMaxWidth(), - ) { - Text( - text = stringResource(R.string.bookmark_empty_list_guest_cta), - color = FirefoxTheme.colors.textOnColorPrimary, - style = FirefoxTheme.typography.button, - textAlign = TextAlign.Center, - ) - } - } } } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksTelemetryMiddleware.kt ===================================== @@ -135,7 +135,6 @@ internal class BookmarksTelemetryMiddleware : Middleware<BookmarksState, Bookmar Init, is SelectFolderAction.ItemClicked, AddFolderAction.ParentFolderClicked, - SignIntoSyncClicked, is AddFolderAction.FolderCreated, is AddFolderAction.TitleChanged, is EditBookmarkAction.TitleChanged, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c02c67cc... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c02c67cc... You're receiving this email because of your account on gitlab.torproject.org.