From 2a181f2d194566cfad4aef144bd2c9ca3c2a6929 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Tue, 19 Apr 2022 19:10:19 -0400
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/20872: Prevent crash when
 updating pending Bookmarks to be deleted without a selected folder.

---
 .../org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 06876ec354..fe9cd34a99 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
@@ -409,7 +409,8 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
 
     private fun updatePendingBookmarksToDelete(selected: Set<BookmarkNode>) {
         pendingBookmarksToDelete.addAll(selected)
-        val bookmarkTree = sharedViewModel.selectedFolder!! - pendingBookmarksToDelete
+        val selectedFolder = sharedViewModel.selectedFolder ?: return
+        val bookmarkTree = selectedFolder - pendingBookmarksToDelete
         bookmarkInteractor.onBookmarksChanged(bookmarkTree)
     }