Skip to content
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

Jump to bottom

Refactor FXIOS-10647 Remove crash alert (backport #23300) #23329

Open
wants to merge 1 commit into
base: release/v133
Choose a base branch
from
+2 −48
Open

Refactor FXIOS-10647 Remove crash alert (backport #23300) #23329

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 2 additions & 48 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 @@ -945,19 +945,8 @@ class BrowserViewController: UIViewController,
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)

// Skip the 'restore tabs' alert on iPad; this avoids some potential UX issues with multi-window. [FXIOS-9079]
let iPadDevice = UIDevice.current.userInterfaceIdiom == .pad
if !iPadDevice && !displayedRestoreTabsAlert && crashedLastLaunch() {
logger.log("The application crashed on last session",
level: .info,
category: .lifecycle)
displayedRestoreTabsAlert = true
showRestoreTabsAlert()
} else {
// Tab restoration is triggered here for new installs, cold launches, or any BVC appearance.
// Note: `restoreTabs()` returns early if `tabs` is not-empty; repeated calls should have no effect.
tabManager.restoreTabs()
}
// Note: `restoreTabs()` returns early if `tabs` is not-empty; repeated calls should have no effect.
tabManager.restoreTabs()

switchToolbarIfNeeded()
updateTabCountUsingTabManager(tabManager, animated: false)
Expand Down Expand Up @@ -1278,41 +1267,6 @@ class BrowserViewController: UIViewController,
overKeyboardContainer.addKeyboardSpacer(spacerHeight: spacerHeight)
}

// Because crashedLastLaunch is sticky, it does not get reset, we need to remember its
// value so that we do not keep asking the user to restore their tabs.
var displayedRestoreTabsAlert = false

fileprivate func crashedLastLaunch() -> Bool {
return logger.crashedLastLaunch
}

fileprivate func showRestoreTabsAlert() {
let alert = UIAlertController.restoreTabsAlert(
okayCallback: { _ in
let extra = [TelemetryWrapper.EventExtraKey.isRestoreTabsStarted.rawValue: true]
TelemetryWrapper.recordEvent(category: .action,
method: .tap,
object: .restoreTabsAlert,
extras: extra)
self.isCrashAlertShowing = false
self.tabManager.restoreTabs(true)
},
noCallback: { _ in
let extra = [TelemetryWrapper.EventExtraKey.isRestoreTabsStarted.rawValue: false]
TelemetryWrapper.recordEvent(category: .action,
method: .tap,
object: .restoreTabsAlert,
extras: extra)
self.isCrashAlertShowing = false
self.tabManager.selectTab(self.tabManager.addTab())
self.openUrlAfterRestore()
AppEventQueue.signal(event: .tabRestoration(self.tabManager.windowUUID))
}
)
self.present(alert, animated: true, completion: nil)
isCrashAlertShowing = true
}

fileprivate func showQueuedAlertIfAvailable() {
if let queuedAlertInfo = tabManager.selectedTab?.dequeueJavascriptAlertPrompt() {
let alertController = queuedAlertInfo.alertController()
Expand Down