fix: Inject AttachmentCacheHelper

Author: Ambrdctr

Mail/MailApp.swift

@@ -18,7 +18,6 @@
 
 import InfomaniakDI
 import MailCore
-import Nuke
 import OSLog
 import SwiftUI
 import UIKit
@@ -36,7 +35,6 @@ struct MailApp: App {
         Logging.resetAppForUITestsIfNeeded()
         Logger.general.info("Application starting in foreground ? \(UIApplication.shared.applicationState != .background)")
         refreshAppBackgroundTask.register()
-        ImagePipeline.shared = ImagePipeline(configuration: .withDataCache)
     }
 
     var body: some Scene {

MailCore/Cache/Attachments/AttachmentCacheHelper.swift

@@ -20,15 +20,17 @@ import Foundation
 import Nuke
 
 struct AttachmentCacheHelper {
+    let pipeline: ImagePipeline
+
     func getCache(resource: String?) -> Data? {
         guard let resource, let resourceURL = URL(string: resource) else { return nil }
         let request = ImageRequest(url: resourceURL)
-        return ImagePipeline.shared.cache.cachedData(for: request)
+        return pipeline.cache.cachedData(for: request)
     }
 
     func storeCache(resource: String?, data: Data) {
         guard let resource, let resourceURL = URL(string: resource) else { return }
         let request = ImageRequest(url: resourceURL)
-        ImagePipeline.shared.cache.storeCachedData(data, for: request)
+        pipeline.cache.storeCachedData(data, for: request)
     }
 }

MailCore/Cache/MailboxManager/MailboxManager+Message.swift

@@ -49,13 +49,12 @@ public extension MailboxManager {
             throw CancellationError()
         }
 
-        let attachmentCacheHelper = AttachmentCacheHelper()
-        let data: Data
-        if let cachedData = attachmentCacheHelper.getCache(resource: attachment.resource) {
-            data = cachedData
+        @InjectService var cacheHelper: AttachmentCacheHelper
+        if let cachedData = cacheHelper.getCache(resource: attachment.resource) {
+            return cachedData
         } else {
-            data = try await apiFetcher.attachment(attachment: attachment, progressObserver: progressObserver)
-            attachmentCacheHelper.storeCache(resource: attachment.resource, data: data)
+            let data = try await apiFetcher.attachment(attachment: attachment, progressObserver: progressObserver)
+            cacheHelper.storeCache(resource: attachment.resource, data: data)
 
             let safeAttachment = ThreadSafeReference(to: attachment)
             try? writeTransaction { writableRealm in
@@ -65,9 +64,8 @@ public extension MailboxManager {
 
                 liveAttachment.saved = true
             }
+            return data
         }
-
-        return data
     }
 
     func saveAttachmentLocally(attachment: Attachment, progressObserver: ((Double) -> Void)?) async {

MailCore/Utils/TargetAssembly.swift

@@ -24,6 +24,7 @@ import InfomaniakDI
 import InfomaniakLogin
 import InfomaniakNotifications
 import MyKSuite
+import Nuke
 import OSLog
 
 private let realmRootPath = "mailboxes"
@@ -126,6 +127,9 @@ open class TargetAssembly {
             },
             Factory(type: MyKSuiteStore.self) { _, _ in
                 MyKSuiteStore()
+            },
+            Factory(type: AttachmentCacheHelper.self) { _, _ in
+                AttachmentCacheHelper(pipeline: ImagePipeline(configuration: .withDataCache))
             }
         ]
     }