Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Bugfix FXIOS-5123 [v107.1] Fix jump back in crash #12369

Merged
merged 2 commits into from
Nov 14, 2022
Merged

Bugfix FXIOS-5123 [v107.1] Fix jump back in crash #12369

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
edb8afb
Fix jump back in crash
OrlaM Nov 11, 2022
8b21646
Fix tests
OrlaM Nov 14, 2022
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
14 changes: 4 additions & 10 deletions Client/Frontend/Home/JumpBackIn/JumpBackInViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ class JumpBackInViewModel: FeatureFlaggable {
// MARK: - Private: Prepare UI data
private extension JumpBackInViewModel {

func refreshData(maxItemsToDisplay: JumpBackInDisplayGroupCount) {
private func refreshData(maxItemsToDisplay: JumpBackInDisplayGroupCount) {
jumpBackInList = createJumpBackInList(
from: recentTabs,
withMaxTabsCount: maxItemsToDisplay.tabsCount,
Expand Down Expand Up @@ -415,24 +415,16 @@ extension JumpBackInViewModel: HomepageViewModelProtocol {
func refreshData(for traitCollection: UITraitCollection,
isPortrait: Bool = UIWindow.isPortrait,
device: UIUserInterfaceIdiom = UIDevice.current.userInterfaceIdiom) {
getLatestData()
updateSectionLayout(for: traitCollection,
isPortrait: isPortrait,
device: device)

let maxItemsToDisplay = sectionLayout.maxItemsToDisplay(
hasAccount: jumpBackInDataAdaptor.hasSyncedTabFeatureEnabled,
device: device
)
refreshData(maxItemsToDisplay: maxItemsToDisplay)
}

private func getLatestData() {
recentTabs = jumpBackInDataAdaptor.getRecentTabData()
recentGroups = jumpBackInDataAdaptor.getGroupsData()
recentSyncedTab = jumpBackInDataAdaptor.getSyncedTabData()
}

func updatePrivacyConcernedSection(isPrivate: Bool) {
self.isPrivate = isPrivate
}
Expand Down Expand Up @@ -509,7 +501,9 @@ extension JumpBackInViewModel: HomepageSectionHandler {
extension JumpBackInViewModel: JumpBackInDelegate {
func didLoadNewData() {
ensureMainThread {
self.getLatestData()
self.recentTabs = self.jumpBackInDataAdaptor.getRecentTabData()
self.recentGroups = self.jumpBackInDataAdaptor.getGroupsData()
self.recentSyncedTab = self.jumpBackInDataAdaptor.getSyncedTabData()
guard self.isEnabled else { return }
self.delegate?.reloadView()
}
Expand Down
22 changes: 22 additions & 0 deletions Tests/ClientTests/Frontend/Home/JumpBackIn/JumpBackInViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ class JumpBackInViewModelTests: XCTestCase {
trait.overridenHorizontalSizeClass = .compact
trait.overridenVerticalSizeClass = .regular

subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: true, device: .phone)
let maxItems = subject.sectionLayout.maxItemsToDisplay(hasAccount: false,
device: .phone)
Expand All @@ -186,6 +187,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .compact
trait.overridenVerticalSizeClass = .regular
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: true, device: .phone)
let maxItems = subject.sectionLayout.maxItemsToDisplay(hasAccount: true,
device: .phone)
Expand All @@ -206,6 +208,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .compact
trait.overridenVerticalSizeClass = .regular
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: true, device: .phone)
let maxItems = subject.sectionLayout.maxItemsToDisplay(hasAccount: true,
device: .phone)
Expand All @@ -225,6 +228,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .regular
trait.overridenVerticalSizeClass = .compact
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: false, device: .phone)
let maxItems = subject.sectionLayout.maxItemsToDisplay(hasAccount: true,
device: .phone)
Expand All @@ -244,6 +248,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .regular
trait.overridenVerticalSizeClass = .compact
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: false, device: .phone)
let maxItems = subject.sectionLayout.maxItemsToDisplay(hasAccount: true,
device: .phone)
Expand All @@ -263,6 +268,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .regular
trait.overridenVerticalSizeClass = .regular
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: true, device: .pad)
let maxItems = subject.sectionLayout.maxItemsToDisplay(hasAccount: true,
device: .pad)
Expand All @@ -282,6 +288,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .regular
trait.overridenVerticalSizeClass = .regular
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: true, device: .pad)
let maxItems = subject.sectionLayout.maxItemsToDisplay(hasAccount: true,
device: .pad)
Expand All @@ -301,6 +308,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .regular
trait.overridenVerticalSizeClass = .regular
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: false, device: .pad)
let maxItems = subject.sectionLayout.maxItemsToDisplay(hasAccount: true,
device: .pad)
Expand All @@ -321,6 +329,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .regular
trait.overridenVerticalSizeClass = .compact
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: true, device: .phone)
let maxItems = subject.sectionLayout.maxItemsToDisplay(hasAccount: true,
device: .phone)
Expand All @@ -340,6 +349,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .regular
trait.overridenVerticalSizeClass = .regular
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: false, device: .pad)
let maxItems = subject.sectionLayout.maxItemsToDisplay(hasAccount: true,
device: .pad)
Expand All @@ -360,6 +370,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .regular
trait.overridenVerticalSizeClass = .compact
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: true, device: .phone)
let maxItems = subject.sectionLayout.maxItemsToDisplay(hasAccount: true,
device: .phone)
Expand All @@ -378,6 +389,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .regular
trait.overridenVerticalSizeClass = .compact
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: false, device: .phone)
let maxItems = subject.sectionLayout.maxItemsToDisplay(hasAccount: true,
device: .phone)
Expand All @@ -396,6 +408,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .regular
trait.overridenVerticalSizeClass = .regular
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: false, device: .pad)
let maxItems = subject.sectionLayout.maxItemsToDisplay(hasAccount: true,
device: .pad)
Expand All @@ -411,6 +424,7 @@ class JumpBackInViewModelTests: XCTestCase {
let tab2 = createTab(profile: mockProfile, urlString: "www.firefox1.com")
let tab3 = createTab(profile: mockProfile, urlString: "www.firefox1.com")
adaptor.recentTabs = [tab1, tab2, tab3]
subject.didLoadNewData()

// Start in portrait
let portraitTrait = MockTraitCollection()
Expand Down Expand Up @@ -455,6 +469,7 @@ class JumpBackInViewModelTests: XCTestCase {

func testRefreshData_noData() {
let subject = createSubject()
subject.didLoadNewData()
subject.refreshData(for: MockTraitCollection())

XCTAssertEqual(subject.jumpBackInList.tabs.count, 0)
Expand All @@ -465,6 +480,7 @@ class JumpBackInViewModelTests: XCTestCase {
let subject = createSubject()
let tab1 = createTab(profile: mockProfile, urlString: "www.firefox1.com")
adaptor.recentTabs = [tab1]
subject.didLoadNewData()
subject.refreshData(for: MockTraitCollection())

XCTAssertEqual(subject.jumpBackInList.tabs.count, 1)
Expand All @@ -474,6 +490,7 @@ class JumpBackInViewModelTests: XCTestCase {
func testRefreshData_syncedTab() {
let subject = createSubject()
adaptor.syncedTab = JumpBackInSyncedTab(client: remoteClient, tab: remoteTab)
subject.didLoadNewData()
subject.refreshData(for: MockTraitCollection())

XCTAssertEqual(subject.jumpBackInList.tabs.count, 0)
Expand All @@ -493,6 +510,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .compact
trait.overridenVerticalSizeClass = .regular
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: true, device: .phone)

XCTAssertEqual(subject.sectionLayout, .compactJumpBackIn)
Expand All @@ -512,6 +530,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .compact
trait.overridenVerticalSizeClass = .regular
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: true, device: .phone)

XCTAssertEqual(subject.sectionLayout, .compactJumpBackIn)
Expand All @@ -532,6 +551,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .compact
trait.overridenVerticalSizeClass = .regular
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: true, device: .phone)

let jumpBackIn = subject.jumpBackInList
Expand All @@ -556,6 +576,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .regular
trait.overridenVerticalSizeClass = .compact
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: false, device: .phone)

let jumpBackIn = subject.jumpBackInList
Expand All @@ -581,6 +602,7 @@ class JumpBackInViewModelTests: XCTestCase {
let trait = MockTraitCollection()
trait.overridenHorizontalSizeClass = .regular
trait.overridenVerticalSizeClass = .compact
subject.didLoadNewData()
subject.refreshData(for: trait, isPortrait: false, device: .phone)

let jumpBackIn = subject.jumpBackInList
Expand Down