move majority of favicon code to app bundle

duckduckgo · Nov 18, 2024 · e053b36 · e053b36
1 parent d7cc5ae
commit e053b36
Show file tree

Hide file tree

Showing 16 changed files with 69 additions and 74 deletions.
diff --git a/Core/CoreFaviconsHelper.swift b/Core/CoreFaviconsHelper.swift
diff --git a/Core/FaviconRequestModifier.swift b/Core/FaviconRequestModifier.swift
@@ -17,6 +17,7 @@
 //  limitations under the License.
 //
 
+import Core
 import Kingfisher
 
 class FaviconRequestModifier: ImageDownloadRequestModifier {

diff --git a/Core/NotFoundCachingDownloader.swift b/Core/NotFoundCachingDownloader.swift
@@ -17,6 +17,7 @@
 //  limitations under the License.
 //
 
+import Core
 import Kingfisher
 
 class NotFoundCachingDownloader: ImageDownloader {
@@ -46,7 +47,7 @@ class NotFoundCachingDownloader: ImageDownloader {
     }
 
     func noFaviconsFound(forDomain domain: String) {
-        guard let hashedKey = CoreFaviconsHelper.defaultResource(forDomain: domain, sourcesProvider: sourcesProvider)?.cacheKey else { return }
+        guard let hashedKey = FaviconsHelper.defaultResource(forDomain: domain, sourcesProvider: sourcesProvider)?.cacheKey else { return }
         notFoundCache[hashedKey] = Date().timeIntervalSince1970
     }
 
@@ -56,7 +57,7 @@ class NotFoundCachingDownloader: ImageDownloader {
     }
 
     func shouldDownload(forDomain domain: String, referenceDate: Date = Date()) -> Bool {
-        guard let hashedKey = CoreFaviconsHelper.defaultResource(forDomain: domain, sourcesProvider: sourcesProvider)?.cacheKey else { return false }
+        guard let hashedKey = FaviconsHelper.defaultResource(forDomain: domain, sourcesProvider: sourcesProvider)?.cacheKey else { return false }
         if let cacheAddTime = notFoundCache[hashedKey],
             referenceDate.timeIntervalSince1970 - cacheAddTime < Self.expiry {
             return false

diff --git a/Core/SyncBookmarksAdapter.swift b/Core/SyncBookmarksAdapter.swift
@@ -66,6 +66,7 @@ public final class SyncBookmarksAdapter {
     public let databaseCleaner: BookmarkDatabaseCleaner
     public let syncDidCompletePublisher: AnyPublisher<Void, Never>
     let syncErrorHandler: SyncErrorHandling
+    private let faviconStoring: FaviconStoring
 
     @UserDefaultsWrapper(key: .syncDidMigrateToImprovedListsHandling, defaultValue: false)
     private var didMigrateToImprovedListsHandling: Bool
@@ -88,10 +89,13 @@ public final class SyncBookmarksAdapter {
 
     public init(database: CoreDataDatabase,
                 favoritesDisplayModeStorage: FavoritesDisplayModeStoring,
-                syncErrorHandler: SyncErrorHandling) {
+                syncErrorHandler: SyncErrorHandling,
+                faviconStoring: FaviconStoring) {
         self.database = database
         self.favoritesDisplayModeStorage = favoritesDisplayModeStorage
         self.syncErrorHandler = syncErrorHandler
+        self.faviconStoring = faviconStoring
+
         syncDidCompletePublisher = syncDidCompleteSubject.eraseToAnyPublisher()
         databaseCleaner = BookmarkDatabaseCleaner(
             bookmarkDatabase: database,
@@ -172,7 +176,7 @@ public final class SyncBookmarksAdapter {
             database: database,
             stateStore: stateStore,
             fetcher: FaviconFetcher(),
-            faviconStore: Favicons.shared,
+            faviconStore: faviconStoring,
             errorEvents: BookmarksFaviconsFetcherErrorHandler()
         )
     }

diff --git a/Core/SyncDataProviders.swift b/Core/SyncDataProviders.swift
@@ -100,14 +100,16 @@ public class SyncDataProviders: DataProvidersSource {
         secureVaultErrorReporter: SecureVaultReporting,
         settingHandlers: [SettingSyncHandler],
         favoritesDisplayModeStorage: FavoritesDisplayModeStoring,
-        syncErrorHandler: SyncErrorHandling
+        syncErrorHandler: SyncErrorHandling,
+        faviconStoring: FaviconStoring
     ) {
         self.bookmarksDatabase = bookmarksDatabase
         self.secureVaultFactory = secureVaultFactory
         self.secureVaultErrorReporter = secureVaultErrorReporter
         bookmarksAdapter = SyncBookmarksAdapter(database: bookmarksDatabase,
                                                 favoritesDisplayModeStorage: favoritesDisplayModeStorage,
-                                                syncErrorHandler: syncErrorHandler)
+                                                syncErrorHandler: syncErrorHandler,
+                                                faviconStoring: faviconStoring)
         credentialsAdapter = SyncCredentialsAdapter(secureVaultFactory: secureVaultFactory,
                                                     secureVaultErrorReporter: secureVaultErrorReporter,
                                                     syncErrorHandler: syncErrorHandler)