[Android] Fix for crash or no action on page bookmark

brave · Jan 28, 2023 · 7c23df7 · 7c23df7
1 parent cd3efcd
commit 7c23df7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java
@@ -42,7 +42,6 @@ public static void addOrEditBookmark(@Nullable BookmarkItem existingBookmarkItem
                 snackbarManager.dismissAllSnackbars();
             }
             bookmarkModel.deleteBookmark(existingBookmarkItem.getId());
-            bookmarkModel.destroy();
             callback.onResult(existingBookmarkItem.getId());
             return;
         }

diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
@@ -326,6 +326,7 @@ protected void onOrientationChange(int newOrientation) {
     }
 
     protected void updateBookmarkButtonStatus() {
+        if (mBookmarkModelSupplier == null) return;
         Tab currentTab = mLocationBarModel.getTab();
         BookmarkModel bridge = mBookmarkModelSupplier.get();
         boolean isBookmarked =