tor-browser

commit 33beadcdd30716d67241b1fa6bc5ac920bad7a54
parent 1cc4545320281a3dda95b6cbe1f08419e7105585
Author: Andrey Zinovyev <azinovyev@mozilla.com>
Date:   Mon, 15 Dec 2025 14:22:58 +0000

Bug 2001208 - Remove (activity as HomeActivity) casts in BookmarkFragment r=android-reviewers,pollymce

# Conflicts:
#	mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarkFragment.kt
#	mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksStore.kt
#	mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/EditBookmarkFragment.kt

# Conflicts:
#	mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarkFragment.kt

Differential Revision: https://phabricator.services.mozilla.com/D273429

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarkFragment.kt
 | 
7
+++----
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/EditBookmarkFragment.kt
 | 
7
+++----

2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarkFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarkFragment.kt
@@ -85,7 +85,7 @@ class BookmarkFragment : Fragment() {
                 val toolbarStore = buildToolbarStore()
                 val searchStore = buildSearchStore(toolbarStore)
                 val buildStore = { composeNavController: NavHostController ->
-                    val homeActivity = (requireActivity() as HomeActivity)
+                    val appStore = requireComponents.appStore
                     val navController = this@BookmarkFragment.findNavController()
 
                     val store by fragmentStore(
@@ -120,8 +120,7 @@ class BookmarkFragment : Fragment() {
                                         false
                                     } else {
                                             navController
-                                                .previousBackStackEntry?.destination?.id ==
-                                                    R.id.homeFragment
+                                                .previousBackStackEntry?.destination?.id == R.id.homeFragment
                                     },
                                     getNavController = { composeNavController },
                                     exitBookmarks = { navController.popBackStack() },
@@ -158,7 +157,7 @@ class BookmarkFragment : Fragment() {
                                         ) ?: ""
                                     },
                                     getBrowsingMode = {
-                                        homeActivity.browsingModeManager.mode
+                                        appStore.state.mode
                                     },
                                     saveBookmarkSortOrder = {
                                         requireContext().settings().bookmarkListSortOrder =
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/EditBookmarkFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/EditBookmarkFragment.kt
@@ -19,7 +19,6 @@ import mozilla.components.compose.browser.toolbar.store.BrowserToolbarState
 import mozilla.components.compose.browser.toolbar.store.BrowserToolbarStore
 import mozilla.components.compose.browser.toolbar.store.Mode
 import mozilla.components.lib.state.helpers.StoreProvider.Companion.fragmentStore
-import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.accounts.FenixFxAEntryPoint
 import org.mozilla.fenix.components.appstate.AppAction
@@ -48,7 +47,7 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
         return ComposeView(requireContext()).apply {
                 setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
                 val buildStore = { composeNavController: NavHostController ->
-                    val homeActivity = (requireActivity() as HomeActivity)
+                    val appStore = requireComponents.appStore
                     val navController = findNavController()
                     val isSignedIntoSync = requireComponents
                         .backgroundServices.accountManager.authenticatedAccount() != null
@@ -70,7 +69,7 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
                                     openBookmarksInNewTab = if (settings().enableHomepageAsNewTab) {
                                         false
                                     } else {
-                                        homeActivity.browsingModeManager.mode.isPrivate
+                                        appStore.state.mode.isPrivate
                                     },
                                     getNavController = { composeNavController },
                                     exitBookmarks = { navController.popBackStack() },
@@ -103,7 +102,7 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
                                         ) ?: ""
                                     },
                                     getBrowsingMode = {
-                                        homeActivity.browsingModeManager.mode
+                                        appStore.state.mode
                                     },
                                     lastSavedFolderCache = context.settings().lastSavedFolderCache,
                                     saveBookmarkSortOrder = {},