Skip to content

Bugfix FXIOS-15341 [Top 10 Bugs] A newly opened empty homepage tab in Private Browsing is also created in normal browsing mode #33017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yoanarios wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −3
Open

Bugfix FXIOS-15341 [Top 10 Bugs] A newly opened empty homepage tab in Private Browsing is also created in normal browsing mode #33017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3e3f7a
Add guard to avoid capturing incorrect screenshot
yoanarios Apr 9, 2026
a1023e9
Fix test by setting selected tab
yoanarios Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1469,9 +1469,7 @@ class BrowserViewController: UIViewController,
}

func willNavigateAway(from tab: Tab?) {
guard let tab else {
return
}
guard let tab else { return }

let screenshotHelper = self.screenshotHelper
let windowUUID = self.windowUUID
Expand Down
3 changes: 3 additions & 0 deletions firefox-ios/Client/Frontend/Browser/ScreenshotHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ class ScreenshotHelper {
// The screenshot is then set for the tab, and a TabEvent is posted to indicate
// that a screenshot has been set for the homepage.
if tab.isFxHomeTab {
// Skip the screenshot if this tab is no longer selected to avoid capturing another tab's content.
guard controller?.tabManager.selectedTab?.tabUUID == tab.tabUUID else { return }

// For complex views like homepage the Screenshot tool could be the controller directly
// so check the contentController first otherwise fallback to the contentView.
let screenshotTool = controller?.contentContainer.contentController as? Screenshotable
Expand Down
1 change: 1 addition & 0 deletions firefox-ios/firefox-ios-tests/Tests/ClientTests/ScreenshotHelperTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ final class ScreenshotHelperTests: XCTestCase, StoreTestUtility {
let tab = Tab(profile: profile, windowUUID: .XCTestDefaultUUID)
let homeURL = URL(string: "internal://local/about/home")
let mockTabWebView = MockTabWebView(tab: tab)
tabManager.selectedTab = tab

mockTabWebView.loadedURL = homeURL
tab.webView = mockTabWebView
Expand Down
Loading