Bugfix FXIOS-8080 Favicon flicker on home (#21222)

mozilla-mobile · Jul 29, 2024 · 44992f1 · 44992f1
1 parent be3fe14
commit 44992f1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 41 deletions.
diff --git a/firefox-ios/Client/Frontend/Home/JumpBackIn/Data/JumpBackInDataAdaptor.swift b/firefox-ios/Client/Frontend/Home/JumpBackIn/Data/JumpBackInDataAdaptor.swift
@@ -9,7 +9,6 @@ import Common
 protocol JumpBackInDataAdaptor: Actor {
     func hasSyncedTabFeatureEnabled() -> Bool
     func getRecentTabData() -> [Tab]
-    func getGroupsData() -> [ASGroup<Tab>]?
     func getSyncedTabData() -> JumpBackInSyncedTab?
 }
 
@@ -76,10 +75,6 @@ actor JumpBackInDataAdaptorImplementation: JumpBackInDataAdaptor, FeatureFlaggab
         return recentTabs
     }
 
-    func getGroupsData() -> [ASGroup<Tab>]? {
-        return recentGroups
-    }
-
     func getSyncedTabData() -> JumpBackInSyncedTab? {
         return mostRecentSyncedTab
     }
@@ -98,30 +93,22 @@ actor JumpBackInDataAdaptorImplementation: JumpBackInDataAdaptor, FeatureFlaggab
     private func updateTabsData() async {
         await withTaskGroup(of: Void.self) { group in
             group.addTask {
-                await self.setRecentTabs(recentTabs: await self.updateRecentTabs())
-                await self.delegate?.didLoadNewData()
+                let recentTabs = await self.updateRecentTabs()
+                await self.setRecentTabs(recentTabs: recentTabs)
             }
             group.addTask {
                 if let remoteTabs = await self.updateRemoteTabs() {
                     await self.createMostRecentSyncedTab(from: remoteTabs)
-                    await self.delegate?.didLoadNewData()
                 }
             }
-            group.addTask {
-                await self.setRecentGroups(recentGroups: await self.updateGroupsData())
-                await self.delegate?.didLoadNewData()
-            }
         }
+        delegate?.didLoadNewData()
     }
 
     private func setRecentTabs(recentTabs: [Tab]) {
         self.recentTabs = recentTabs
     }
 
-    private func setRecentGroups(recentGroups: [ASGroup<Tab>]?) {
-        self.recentGroups = recentGroups
-    }
-
     private func updateRecentTabs() async -> [Tab] {
         // Recent tabs need to be accessed from .main otherwise value isn't proper
         return await withCheckedContinuation { continuation in
@@ -131,10 +118,6 @@ actor JumpBackInDataAdaptorImplementation: JumpBackInDataAdaptor, FeatureFlaggab
         }
     }
 
-    private func updateGroupsData() async -> [ASGroup<Tab>]? {
-        return nil
-    }
-
     // MARK: Synced tab data
 
     private func getHasSyncAccount() async -> Bool {

diff --git a/firefox-ios/Client/Frontend/Home/JumpBackIn/JumpBackInViewModel.swift b/firefox-ios/Client/Frontend/Home/JumpBackIn/JumpBackInViewModel.swift
@@ -449,15 +449,22 @@ extension JumpBackInViewModel: HomepageSectionHandler {
 extension JumpBackInViewModel: JumpBackInDelegate {
     func didLoadNewData() {
         Task { @MainActor in
-            self.recentTabs = await self.jumpBackInDataAdaptor.getRecentTabData()
-            self.recentSyncedTab = await self.jumpBackInDataAdaptor.getSyncedTabData()
-            self.isSyncTabFeatureEnabled = await self.jumpBackInDataAdaptor.hasSyncedTabFeatureEnabled()
+            await self.updateJumpBackInData()
             logger.log("JumpBack didLoadNewData and section shouldShow \(self.shouldShow)",
                        level: .debug,
                        category: .homepage)
-            guard self.isEnabled else { return }
-
-            self.delegate?.reloadView()
+            reloadView()
         }
     }
+
+    private func updateJumpBackInData() async {
+        self.recentTabs = await self.jumpBackInDataAdaptor.getRecentTabData()
+        self.recentSyncedTab = await self.jumpBackInDataAdaptor.getSyncedTabData()
+        self.isSyncTabFeatureEnabled = await self.jumpBackInDataAdaptor.hasSyncedTabFeatureEnabled()
+    }
+
+    private func reloadView() {
+        guard self.isEnabled else { return }
+        self.delegate?.reloadView()
+    }
 }
diff --git a/...fox-ios-tests/Tests/ClientTests/Frontend/Home/JumpBackIn/JumpBackInDataAdaptorTests.swift b/...fox-ios-tests/Tests/ClientTests/Frontend/Home/JumpBackIn/JumpBackInDataAdaptorTests.swift
@@ -8,11 +8,7 @@ import XCTest
 import WebKit
 import Common
 
-// NOTE:
-// Tab groups not tested at the moment since it depends on RustPlaces concrete object.
-// Need protocol to be able to fix this
-
-class JumpBackInDataAdaptorTests: XCTestCase {
+final class JumpBackInDataAdaptorTests: XCTestCase {
     var mockTabManager: MockTabManager!
     var mockProfile: MockProfile!
     let sleepTime: UInt64 = 100_000_000
@@ -33,7 +29,7 @@ class JumpBackInDataAdaptorTests: XCTestCase {
         mockTabManager = nil
     }
 
-    func testEmptyData_tabTrayGroupsDisabled() async {
+    func testEmptyData() async {
         let subject = createSubject()
         try? await Task.sleep(nanoseconds: sleepTime)
 

diff --git a/...refox-ios-tests/Tests/ClientTests/Frontend/Home/JumpBackIn/JumpBackInViewModelTests.swift b/...refox-ios-tests/Tests/ClientTests/Frontend/Home/JumpBackIn/JumpBackInViewModelTests.swift
@@ -628,15 +628,6 @@ actor JumpBackInDataAdaptorMock: JumpBackInDataAdaptor {
         return recentTabs
     }
 
-    var recentGroups: [ASGroup<Tab>]?
-    func setRecentGroups(recentGroups: [ASGroup<Tab>]?) {
-        self.recentGroups = recentGroups
-    }
-
-    func getGroupsData() -> [ASGroup<Tab>]? {
-        return recentGroups
-    }
-
     var mockHasSyncedTabFeatureEnabled = true
     func setMockHasSyncedTabFeatureEnabled(enabled: Bool) {
         mockHasSyncedTabFeatureEnabled = enabled