feat: Added an ExpiringActivity to initFileProviderDomains

Infomaniak · Feb 28, 2024 · a2a04bb · a2a04bb
1 parent ef191a9
commit a2a04bb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/kDriveCore/Data/Cache/DriveInfosManager/DriveInfosManager+FileProvider.swift b/kDriveCore/Data/Cache/DriveInfosManager/DriveInfosManager+FileProvider.swift
@@ -26,6 +26,9 @@ public extension DriveInfosManager {
     private typealias FilteredDomain = (new: NSFileProviderDomain, existing: NSFileProviderDomain?)
 
     internal func initFileProviderDomains(drives: [Drive], user: InfomaniakCore.UserProfile) {
+        let expiringActivity = ExpiringActivity(id: "\(#function)_\(UUID().uuidString)", delegate: nil)
+        expiringActivity.start()
+
         // Clean file provider storage if needed
         if UserDefaults.shared.fpStorageVersion < currentFpStorageVersion {
             do {
@@ -42,6 +45,12 @@ public extension DriveInfosManager {
             }
         }
 
+        guard !expiringActivity.shouldTerminate else {
+            // Sentry
+            expiringActivity.endAll()
+            return
+        }
+
         // TODO: Start Activity
         Task {
             let updatedDomains = drives.map {
@@ -94,7 +103,7 @@ public extension DriveInfosManager {
                 // TODO: add Sentry
             }
 
-            // TODO: notify for consistency
+            expiringActivity.endAll()
         }
     }
 
@@ -123,17 +132,6 @@ public extension DriveInfosManager {
         }
     }
 
-    internal func getFileProviderDomain(for driveId: String, completion: @escaping (NSFileProviderDomain?) -> Void) {
-        NSFileProviderManager.getDomainsWithCompletionHandler { domains, error in
-            if let error {
-                DDLogError("Error while getting domains: \(error)")
-                completion(nil)
-            } else {
-                completion(domains.first { $0.identifier.rawValue == driveId })
-            }
-        }
-    }
-
     func getFileProviderManager(for drive: Drive, completion: @escaping (NSFileProviderManager) -> Void) {
         getFileProviderManager(for: drive.objectId, completion: completion)
     }
@@ -153,6 +151,17 @@ public extension DriveInfosManager {
         }
     }
 
+    private func getFileProviderDomain(for driveId: String, completion: @escaping (NSFileProviderDomain?) -> Void) {
+        NSFileProviderManager.getDomainsWithCompletionHandler { domains, error in
+            if let error {
+                DDLogError("Error while getting domains: \(error)")
+                completion(nil)
+            } else {
+                completion(domains.first { $0.identifier.rawValue == driveId })
+            }
+        }
+    }
+
     // MARK: Signal
 
     /// Signal changes on this Drive to the File Provider Extension

diff --git a/kDriveCore/Data/Cache/DriveInfosManager/DriveInfosManager.swift b/kDriveCore/Data/Cache/DriveInfosManager/DriveInfosManager.swift
@@ -17,7 +17,6 @@
  */
 
 import CocoaLumberjackSwift
-import FileProvider
 import Foundation
 import InfomaniakCore
 import Realm