Commit 2e91e6a6 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 f8d613dd

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

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ internal data class BookmarkLongClicked(val item: BookmarkItem.Bookmark) : Bookm 
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
@@ -175,7 +175,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
@@ -72,7 +72,6 @@ internal fun bookmarksReducer(state: BookmarksState, action: BookmarksAction) = 
    CloseClicked,

    FirstSyncCompleted,

    SelectFolderAction.ViewAppeared,

    SignIntoSyncClicked,

    is ViewAppeared,

    PrivateBrowsingAuthorized,

    -> state

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

+1 −26
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ private fun EmptyList( 
                EmptyListState.NoSearchResults -> NoSearchResults()

                is EmptyListState.NotAuthenticated -> RootEmptyContent(

                    dispatcher,

                    showSignIn = true,

                    showSignIn = false,

                )

                EmptyListState.Authenticated -> RootEmptyContent(

                    dispatcher,
@@ -1074,16 +1074,6 @@ private fun RootEmptyContent( 
    dispatcher: (BookmarksAction) -> Unit,

    showSignIn: 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,
@@ -1095,26 +1085,11 @@ private fun RootEmptyContent( 


    if (showSignIn) {

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



        OutlinedButton(

            text = stringResource(R.string.bookmark_empty_list_guest_cta),

            onClick = { dispatcher(SignIntoSyncClicked) },

            modifier = Modifier

                .heightIn(40.dp)

                .fillMaxWidth(),

        )

    }

}



@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
@@ -64,7 +64,7 @@ internal class BookmarksTelemetryMiddleware : Middleware<BookmarksState, Bookmar 
            is ViewAppeared,

            is BookmarkToEditLoaded,

            is ReceivedSyncSignInUpdate,

            CloseClicked, AddFolderClicked, SignIntoSyncClicked,

            CloseClicked, AddFolderClicked,

            OpenTabsConfirmationDialogAction.CancelTapped, OpenTabsConfirmationDialogAction.ConfirmTapped,

            FirstSyncCompleted, PrivateBrowsingAuthorized,

                -> Unit