Commit 025849f1 authored by clairehurst's avatar clairehurst 🌱 Committed by Pier Angelo Vendrame
Browse files

TB 44098: [android] Disable sync 

#44098 Bookmarks offer a way to go to sync in 15.0a1
parent a22efe92

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksAction.kt

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ internal data object SearchDismissed : 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/bookmarks/BookmarksMiddleware.kt

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ internal class BookmarksMiddleware( 
            }

            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/bookmarks/BookmarksReducer.kt

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ internal fun bookmarksReducer(state: BookmarksState, action: BookmarksAction) = 
    CloseClicked,

    FirstSyncCompleted,

    SelectFolderAction.ViewAppeared,

    SignIntoSyncClicked,

    is InitEdit,

    Init,

    PrivateBrowsingAuthorized,

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt

+1 −16
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ private fun EmptyList( 
            when (state) {

                is EmptyListState.NotAuthenticated -> RootEmptyContent(

                    dispatcher,

                    showSignIn = true,

                    showSignIn = false,

                    showBookmarksImport = showBookmarksImport,

                )

                EmptyListState.Authenticated -> RootEmptyContent(
@@ -1037,14 +1037,6 @@ private fun RootEmptyContent( 
    showSignIn: Boolean,

    showBookmarksImport: Boolean,

) {

    Image(

        painter = painterResource(R.drawable.ic_kit_bookmarks_empty_state),

        modifier = Modifier.width(204.dp).height(182.dp),

        contentDescription = null,

    )



    Spacer(modifier = Modifier.height(FirefoxTheme.layout.space.static200))



    Text(

        text = stringResource(R.string.bookmark_empty_list_root_title),

        color = MaterialTheme.colorScheme.onSurface,
@@ -1079,13 +1071,6 @@ private fun RootEmptyContent( 


@Composable

private fun FolderEmptyContent() {

    Image(

        painter = painterResource(R.drawable.bookmarks_folder_illustration),

        contentDescription = null,

    )



    Spacer(modifier = Modifier.height(FirefoxTheme.layout.space.static200))



    Text(

        text = stringResource(R.string.bookmark_empty_list_title),

        color = MaterialTheme.colorScheme.onSurface,

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksTelemetryMiddleware.kt

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ internal class BookmarksTelemetryMiddleware : Middleware<BookmarksState, Bookmar 
            is InitEdit,

            is InitEditLoaded,

            is ReceivedSyncSignInUpdate,

            CloseClicked, AddFolderClicked, Init, SignIntoSyncClicked,

            CloseClicked, AddFolderClicked, Init,

            OpenTabsConfirmationDialogAction.CancelTapped, OpenTabsConfirmationDialogAction.ConfirmTapped,

            FirstSyncCompleted, PrivateBrowsingAuthorized,

                -> Unit