Commit f30f0d00 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 68e2f333

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

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,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
@@ -150,7 +150,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
@@ -169,7 +169,6 @@ internal fun bookmarksReducer(state: BookmarksState, action: BookmarksAction) = 
    FirstSyncCompleted,

    ViewDisposed,

    SelectFolderAction.ViewAppeared,

    SignIntoSyncClicked,

    is InitEdit,

    Init,

    PrivateBrowsingAuthorized,

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

+0 −24
Original line number Diff line number Diff line
@@ -1003,35 +1003,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) {

                PrimaryButton(

                    text = stringResource(R.string.bookmark_empty_list_guest_cta),

                    onClick = { dispatcher(SignIntoSyncClicked) },

                    textColor = MaterialTheme.colorScheme.onPrimary,

                    modifier = Modifier

                        .heightIn(36.dp)

                        .fillMaxWidth()

                        .background(

                            color = MaterialTheme.colorScheme.primary,

                            shape = RoundedCornerShape(4.dp),

                        ),

                )

            }

        }

    }

}

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

+0 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ internal class BookmarksTelemetryMiddleware : Middleware<BookmarksState, Bookmar 
            Init,

            is SelectFolderAction.ItemClicked,

            AddFolderAction.ParentFolderClicked,

            SignIntoSyncClicked,

            is AddFolderAction.FolderCreated,

            is AddFolderAction.TitleChanged,

            is EditBookmarkAction.TitleChanged,