From d1a94de89ee9fc2a5b25f94ebfb8f8d6ba6dca47 Mon Sep 17 00:00:00 2001 From: Roger Yang Date: Tue, 22 Feb 2022 14:25:52 -0500 Subject: [PATCH] [fenix] Revert "For https://github.com/mozilla-mobile/fenix/issues/13336: Open bookmarks in current tab (https://github.com/mozilla-mobile/fenix/pull/23169)" This reverts commit 52157add58e5ed6accc64e1e4fae69e655432d91. --- .../mozilla/fenix/library/bookmarks/BookmarkController.kt | 2 +- .../fenix/library/bookmarks/BookmarkControllerTest.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkController.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkController.kt index 385849a24a..629db7611a 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkController.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkController.kt @@ -77,7 +77,7 @@ class DefaultBookmarkController( val flags = EngineSession.LoadUrlFlags.select(EngineSession.LoadUrlFlags.ALLOW_JAVASCRIPT_URL) openInNewTabAndShow( item.url!!, - false, + true, BrowserDirection.FromBookmarks, activity.browsingModeManager.mode, flags diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt index 226ac4e740..b72a931823 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt @@ -110,7 +110,7 @@ class BookmarkControllerTest { } @Test - fun `handleBookmarkTapped should load the bookmark in the current tab`() { + fun `handleBookmarkTapped should load the bookmark in a new tab`() { var invokePendingDeletionInvoked = false val flags = EngineSession.LoadUrlFlags.select(EngineSession.LoadUrlFlags.ALLOW_JAVASCRIPT_URL) @@ -124,7 +124,7 @@ class BookmarkControllerTest { verify { homeActivity.openToBrowserAndLoad( item.url!!, - false, + true, BrowserDirection.FromBookmarks, flags = flags ) @@ -290,7 +290,7 @@ class BookmarkControllerTest { verify { homeActivity.openToBrowserAndLoad( item.url!!, - false, + true, BrowserDirection.FromBookmarks, flags = flags )