fix: ShareExtension fails to upload (#1123)

* feat: DI is aware of context that starts it

* feat: New AppContextService

* refactor: Migrate isExtension to appContextService.isExtension

* fix: Prevent UploadQueue in ShareExtension mode

* chore: PR Feedback

kDrive/AppDelegate.swift

@@ -36,7 +36,7 @@ import VersionChecker
 @main
 final class AppDelegate: UIResponder, UIApplicationDelegate, AccountManagerDelegate {
     /// Making sure the DI is registered at a very early stage of the app launch.
-    private let dependencyInjectionHook = EarlyDIHook()
+    private let dependencyInjectionHook = EarlyDIHook(context: .app)
 
     private var reachabilityListener: ReachabilityListener!
     private static let currentStateVersion = 4

kDrive/UI/Controller/Files/Save File/SaveFileViewController+FooterButtonDelegate.swift

@@ -68,7 +68,7 @@ extension SaveFileViewController: FooterButtonDelegate {
 
     private func processForUpload(files: [ImportedFile], directory: File, drive: Drive) async throws {
         // We only schedule for uploading in main app target
-        let addToQueue = !Bundle.main.isExtension
+        let addToQueue = !appContextService.isExtension
         try await fileImportHelper.saveForUpload(files, in: directory, drive: drive, addToQueue: addToQueue)
         #if ISEXTENSION
         showOpenAppToContinueNotification()

kDrive/UI/Controller/Files/Save File/SaveFileViewController.swift

@@ -28,6 +28,7 @@ import UIKit
 class SaveFileViewController: UIViewController {
     @LazyInjectService var accountManager: AccountManageable
     @LazyInjectService var fileImportHelper: FileImportHelper
+    @LazyInjectService var appContextService: AppContextServiceable
 
     enum SaveFileSection {
         case alert
@@ -184,7 +185,7 @@ class SaveFileViewController: UIViewController {
     func dismiss(animated: Bool, clean: Bool = true, completion: (() -> Void)? = nil) {
         Task {
             // Cleanup file that were duplicated to appGroup on extension mode
-            if Bundle.main.isExtension && clean {
+            if appContextService.isExtension && clean {
                 await items.concurrentForEach { item in
                     try? FileManager.default.removeItem(at: item.path)
                 }

kDrive/Utils/AppFactoryService.swift

@@ -23,14 +23,16 @@ import os.log
 
 /// Something that loads the DI on init
 public struct EarlyDIHook {
-    public init() {
-        // setup DI ASAP
+    public init(context: DriveAppContext) {
+        os_log("EarlyDIHook")
 
-        let navigationManagerFactory = Factory(type: NavigationManageable.self) { _, _ in
+        let extraDependencies = [Factory(type: NavigationManageable.self) { _, _ in
             NavigationManager()
-        }
+        }, Factory(type: AppContextServiceable.self) { _, _ in
+            AppContextService(context: context)
+        }]
 
-        os_log("EarlyDIHook")
-        FactoryService.setupDependencyInjection(other: [navigationManagerFactory])
+        // setup DI ASAP
+        FactoryService.setupDependencyInjection(other: extraDependencies)
     }
 }

kDriveActionExtension/ActionNavigationController.swift

@@ -25,7 +25,7 @@ import VersionChecker
 
 final class ActionNavigationController: TitleSizeAdjustingNavigationController {
     /// Making sure the DI is registered at a very early stage of the app launch.
-    private let dependencyInjectionHook = EarlyDIHook()
+    private let dependencyInjectionHook = EarlyDIHook(context: .actionExtension)
 
     @LazyInjectService var accountManager: AccountManageable
 

kDriveCore/Data/Api/DriveApiFetcher.swift

@@ -465,6 +465,7 @@ public class DriveApiFetcher: ApiFetcher {
 class SyncedAuthenticator: OAuthAuthenticator {
     @LazyInjectService var accountManager: AccountManageable
     @LazyInjectService var tokenable: InfomaniakTokenable
+    @LazyInjectService var appContextService: AppContextServiceable
 
     override func refresh(
         _ credential: OAuthAuthenticator.Credential,
@@ -507,7 +508,7 @@ class SyncedAuthenticator: OAuthAuthenticator {
             let group = DispatchGroup()
             group.enter()
             var taskIdentifier: UIBackgroundTaskIdentifier = .invalid
-            if !Bundle.main.isExtension {
+            if !self.appContextService.isExtension {
                 // It is absolutely necessary that the app stays awake while we refresh the token
                 taskIdentifier = UIApplication.shared.beginBackgroundTask(withName: "Refresh token") {
                     let message = "Refreshing token failed - Background task expired"

kDriveCore/Data/DownloadQueue/DownloadArchiveOperation.swift

@@ -26,6 +26,7 @@ public class DownloadArchiveOperation: Operation {
     // MARK: - Attributes
 
     @LazyInjectService var accountManager: AccountManageable
+    @LazyInjectService var appContextService: AppContextServiceable
 
     private let archiveId: String
     private let driveFileManager: DriveFileManager
@@ -85,7 +86,7 @@ public class DownloadArchiveOperation: Operation {
             return
         }
 
-        if !Bundle.main.isExtension {
+        if !appContextService.isExtension {
             backgroundTaskIdentifier = UIApplication.shared.beginBackgroundTask(withName: "File Archive Downloader") {
                 DownloadQueue.instance.suspendAllOperations()
                 // We don't support task rescheduling for archive download but still need to pass error to differentiate from user

kDriveCore/Data/DownloadQueue/DownloadOperation.swift

@@ -36,6 +36,7 @@ public class DownloadOperation: Operation, DownloadOperationable {
 
     @LazyInjectService var accountManager: AccountManageable
     @LazyInjectService var downloadManager: BackgroundDownloadSessionManager
+    @LazyInjectService var appContextService: AppContextServiceable
 
     private let fileManager = FileManager.default
     private let driveFileManager: DriveFileManager
@@ -116,7 +117,7 @@ public class DownloadOperation: Operation, DownloadOperationable {
             return
         }
 
-        if !Bundle.main.isExtension {
+        if !appContextService.isExtension {
             backgroundTaskIdentifier = UIApplication.shared.beginBackgroundTask(withName: "File Downloader") {
                 DownloadQueue.instance.suspendAllOperations()
                 DDLogInfo("[DownloadOperation] Background task expired")

kDriveCore/Data/DownloadQueue/DownloadQueue.swift

@@ -58,6 +58,7 @@ public final class DownloadQueue {
     // MARK: - Attributes
 
     @LazyInjectService var accountManager: AccountManageable
+    @LazyInjectService var appContextService: AppContextServiceable
 
     public static let instance = DownloadQueue()
     public static let backgroundIdentifier = "com.infomaniak.background.download"
@@ -90,7 +91,7 @@ public final class DownloadQueue {
     )
 
     private var bestSession: FileDownloadSession {
-        if Bundle.main.isExtension {
+        if appContextService.isExtension {
             @InjectService var backgroundDownloadSessionManager: BackgroundDownloadSessionManager
             return backgroundDownloadSessionManager
         } else {
@@ -220,25 +221,25 @@ public final class DownloadQueue {
     }
 
     private func publishFileDownloaded(fileId: Int, error: DriveError?) {
-        observations.didDownloadFile.values.forEach { closure in
+        for closure in observations.didDownloadFile.values {
             closure(fileId, error)
         }
     }
 
     func publishProgress(_ progress: Double, for fileId: Int) {
-        observations.didChangeProgress.values.forEach { closure in
+        for closure in observations.didChangeProgress.values {
             closure(fileId, progress)
         }
     }
 
     private func publishArchiveDownloaded(archiveId: String, archiveUrl: URL?, error: DriveError?) {
-        observations.didDownloadArchive.values.forEach { closure in
+        for closure in observations.didDownloadArchive.values {
             closure(archiveId, archiveUrl, error)
         }
     }
 
     func publishProgress(_ progress: Double, for archiveId: String) {
-        observations.didChangeArchiveProgress.values.forEach { closure in
+        for closure in observations.didChangeArchiveProgress.values {
             closure(archiveId, progress)
         }
     }

kDriveCore/Data/UploadQueue/Chunk/RangeProviderGuts.swift

@@ -17,6 +17,7 @@
  */
 
 import Foundation
+import InfomaniakDI
 
 /// The internal methods of RangeProviderGuts, made testable
 public protocol RangeProviderGutsable {
@@ -45,6 +46,8 @@ public protocol RangeProviderGutsable {
 
 /// Subdivided **RangeProvider**, so it is easier to test
 public struct RangeProviderGuts: RangeProviderGutsable {
+    @LazyInjectService private var appContextService: AppContextServiceable
+
     /// The URL of the local file to scan
     public let fileURL: URL
 
@@ -107,7 +110,7 @@ public struct RangeProviderGuts: RangeProviderGutsable {
 
     public func preferredChunkSize(for fileSize: UInt64) -> UInt64 {
         // In extension to reduce memory footprint, we reduce drastically chunk size
-        guard !Bundle.main.isExtension else {
+        guard !appContextService.isExtension else {
             let capChunkSize = min(fileSize, RangeProvider.APIConstants.chunkMinSize)
             return capChunkSize
         }

kDriveCore/Data/UploadQueue/Queue/UploadParallelismHeuristic.swift

@@ -17,6 +17,7 @@
  */
 
 import Foundation
+import InfomaniakDI
 
 /// Delegate protocol of UploadParallelismHeuristic
 protocol ParallelismHeuristicDelegate: AnyObject {
@@ -33,6 +34,8 @@ final class UploadParallelismHeuristic {
     /// With 2 Operations max, and a chuck of 1MiB max, the UploadQueue can spike to max 4MiB memory usage.
     private static let reducedParallelism = 2
 
+    @LazyInjectService private var appContextService: AppContextServiceable
+
     private weak var delegate: ParallelismHeuristicDelegate?
 
     init(delegate: ParallelismHeuristicDelegate) {
@@ -80,7 +83,7 @@ final class UploadParallelismHeuristic {
         }
 
         // In extension, to reduce memory footprint, we reduce drastically parallelism
-        guard !Bundle.main.isExtension else {
+        guard !appContextService.isExtension else {
             currentParallelism = Self.reducedParallelism
             return
         }