From 2382044e463aecda25beb779cdc9133f1e159ce8 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sun, 28 Jan 2024 12:27:59 +0100 Subject: [PATCH] Bug 1861744 - Don't display pending to delete bookmarks when refresh (backport #5236) (#5319) When deleting bookmarks, we do not instantly remove them due to having the possibility of undoing the deletion. Because of this, when the bookmarks are pending to delete, they can still be displayed when pulling down to refresh and then acted on. This patch aims to fix this issue by subtracting the pending to delete bookmarks when they are refreshed by pulling down. (cherry picked from commit b98eea7fdc7901b1df91dcf796635a25cbe22900) Co-authored-by: DreVla --- .../java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt index 2108dc143..466467589 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt @@ -281,6 +281,7 @@ class BookmarkFragment : LibraryPageFragment(), UserInteractionHan context?.let { requireContext().bookmarkStorage .getTree(guid, recursive) + ?.minus(pendingBookmarksToDelete) ?.let { desktopFolders.withOptionalDesktopFolders(it) } } }