refactor: Remove last uses of BackgroundExecutor

Infomaniak · May 3, 2024 · f416971 · f416971
1 parent ca67d83
commit f416971
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 76 deletions.
diff --git a/MailCore/API/SyncedAuthenticator.swift b/MailCore/API/SyncedAuthenticator.swift
@@ -97,28 +97,21 @@ final class SyncedAuthenticator: OAuthAuthenticator {
             }
         }
 
-        // It is absolutely necessary that the app stays awake while we refresh the token
-        BackgroundExecutor.executeWithBackgroundTask { endBackgroundTask in
-            self.networkLoginService.refreshToken(token: credential) { token, error in
-                // New token has been fetched correctly
-                if let token {
-                    SentrySDK
-                        .addBreadcrumb(token
-                            .generateBreadcrumb(level: .info, message: "Refreshing token - Success with remote"))
-                    self.refreshTokenDelegate?.didUpdateToken(newToken: token, oldToken: credential)
-                    completion(.success(token))
-                } else {
-                    completion(self.handleFailedRefreshingToken(oldToken: credential, error: error))
-                }
-                endBackgroundTask()
+        // It is necessary that the app stays awake while we refresh the token
+        let expiringActivity = ExpiringActivity()
+        expiringActivity.start()
+        networkLoginService.refreshToken(token: credential) { token, error in
+            // New token has been fetched correctly
+            if let token {
+                SentrySDK
+                    .addBreadcrumb(token
+                        .generateBreadcrumb(level: .info, message: "Refreshing token - Success with remote"))
+                self.refreshTokenDelegate?.didUpdateToken(newToken: token, oldToken: credential)
+                completion(.success(token))
+            } else {
+                completion(self.handleFailedRefreshingToken(oldToken: credential, error: error))
             }
-        } onExpired: {
-            SentrySDK
-                .addBreadcrumb((credential as ApiToken)
-                    .generateBreadcrumb(level: .error, message: "Refreshing token failed - Background task expired"))
-            // If we didn't fetch the new token in the given time there is not much we can do apart from hoping that it wasn't
-            // revoked
-            completion(.failure(MailError.noToken))
+            expiringActivity.endAll()
         }
     }
 }
diff --git a/MailCore/Cache/BackgroundExecutor.swift b/MailCore/Cache/BackgroundExecutor.swift
diff --git a/MailCore/Utils/Model/Realm/BackgroundRealm.swift b/MailCore/Utils/Model/Realm/BackgroundRealm.swift
@@ -17,6 +17,7 @@
  */
 
 import Foundation
+import InfomaniakCore
 import RealmSwift
 import Sentry
 
@@ -38,16 +39,12 @@ public final class BackgroundRealm {
     }
 
     public func execute<T>(_ block: @escaping (Realm) -> T, completion: @escaping (T) -> Void) {
-        BackgroundExecutor.executeWithBackgroundTask { [weak self] taskCompleted in
-            self?.queue.async {
-                guard let realm = self?.getRealm() else { return }
-                completion(block(realm))
-                taskCompleted()
-            }
-        } onExpired: {
-            let expiredBreadcrumb = Breadcrumb(level: .warning, category: "BackgroundRealm")
-            expiredBreadcrumb.message = "Task expired before completing"
-            SentrySDK.addBreadcrumb(expiredBreadcrumb)
+        let expiringActivity = ExpiringActivity()
+        expiringActivity.start()
+        queue.async {
+            let realm = self.getRealm()
+            completion(block(realm))
+            expiringActivity.endAll()
         }
     }