Commit 39427416 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 81eff0c7

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
@@ -143,7 +143,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
@@ -68,7 +68,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

+0 −28
Original line number Diff line number Diff line
@@ -1307,39 +1307,11 @@ private fun EmptyList( 
            modifier = Modifier.width(FirefoxTheme.layout.size.containerMaxWidth),

            horizontalAlignment = Alignment.CenterHorizontally,

        ) {

            Image(

                painter = painterResource(state.drawableId()),

                contentDescription = null,

            )



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



            Text(

                text = stringResource(R.string.bookmark_empty_list_title),

                color = MaterialTheme.colorScheme.onSurface,

                style = FirefoxTheme.typography.headline6,

            )



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



            Text(

                text = stringResource(state.descriptionId()),

                color = MaterialTheme.colorScheme.onSurfaceVariant,

                style = FirefoxTheme.typography.body2,

                textAlign = TextAlign.Center,

            )



            if (state is EmptyListState.NotAuthenticated) {

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



                FilledButton(

                    text = stringResource(R.string.bookmark_empty_list_guest_cta),

                    onClick = { dispatcher(SignIntoSyncClicked) },

                    modifier = Modifier

                        .heightIn(36.dp)

                        .fillMaxWidth(),

                )

            }

        }

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,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