Remove async and assert running on the main thread

Author: crazytonyli

WordPress/Classes/Services/MediaCoordinator.swift

@@ -453,9 +453,8 @@ class MediaCoordinator: NSObject {
         WPAppAnalytics.track(event, properties: properties, blog: media.blog)
     }
 
-    @MainActor
-    func submitBackgroundUploadTask() async {
-        await mediaLibraryProgressCoordinator.submitBackgroundUploadTask()
+    func submitBackgroundUploadTask() {
+        mediaLibraryProgressCoordinator.submitBackgroundUploadTask()
     }
 
     // MARK: - Progress

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -193,9 +193,7 @@ public class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
 
     public func applicationWillResignActive(_ application: UIApplication) {
         DDLogInfo("\(self) \(#function)")
-        Task {
-            await MediaCoordinator.shared.submitBackgroundUploadTask()
-        }
+        MediaCoordinator.shared.submitBackgroundUploadTask()
     }
 
     public func applicationDidBecomeActive(_ application: UIApplication) {

WordPress/Classes/ViewRelated/Aztec/Media/MediaProgressCoordinator.swift

@@ -76,16 +76,15 @@ public class MediaProgressCoordinator: NSObject {
 
     /// Utilize BGContinuedProcessingTask to show upload progress and extend the allowed background time for the upload.
     /// Note: This function needs to be called before the app goes to the background.
-    @MainActor
-    func submitBackgroundUploadTask() async {
+    func submitBackgroundUploadTask() {
         guard let scheduler = mediaUploadBackgroundTaskScheduler() else { return }
 
         for (mediaID, progress) in mediaInProgress {
             guard let media = media(withIdentifier: mediaID) else {
                 continue
             }
             if media.remoteStatus == .pushing || media.remoteStatus == .processing {
-                await scheduler.scheduleTask(for: TaggedManagedObjectID(media), progress: progress)
+                scheduler.scheduleTask(for: TaggedManagedObjectID(media), progress: progress)
             }
         }
     }

WordPress/Classes/ViewRelated/Aztec/Media/MediaUploadBackgroundTaskScheduler.swift

@@ -6,7 +6,10 @@ import WordPressShared
 // This protocol is used to hide the `@available(iOS 26.0, *)` check.
 protocol MediaUploadBackgroundTaskScheduler {
 
-    func scheduleTask(for media: TaggedManagedObjectID<Media>, progress: Progress) async
+    /// Create a `BGContinuedProcessingTask` to get extra background time for the media uploading.
+    ///
+    /// Note: This method must be called from the main thread.
+    func scheduleTask(for media: TaggedManagedObjectID<Media>, progress: Progress)
 
 }
 
@@ -19,8 +22,10 @@ func mediaUploadBackgroundTaskScheduler() -> MediaUploadBackgroundTaskScheduler?
 }
 
 /// Utilize `BGContinuedProcessingTask` to show the uploading media activity.
+///
+/// Due to how media uploading is implemented currently, we need to read the uploading state from the main thread.
+/// For better code readability, this type is implemented in the same way where everything runs on the main thread.
 @available(iOS 26.0, *)
-@MainActor
 private class ConcreteMediaUploadBackgroundTaskScheduler: MediaUploadBackgroundTaskScheduler {
     struct Item {
         // Please note: all media query needs to be done in the main context, due to the current upload media implementation.
@@ -80,6 +85,8 @@ private class ConcreteMediaUploadBackgroundTaskScheduler: MediaUploadBackgroundT
     }
 
     func scheduleTask(for media: TaggedManagedObjectID<Media>, progress: Progress) {
+        wpAssert(Thread.isMainThread)
+
         observeCoreDataChanges()
 
         let item = Item(media: media, progress: progress)
@@ -148,6 +155,10 @@ private class ConcreteMediaUploadBackgroundTaskScheduler: MediaUploadBackgroundT
         }
 
         self.state = .accepted(accepted)
+
+        // Immediately update the `BGContinuedProcessingTask` instance with the current media uploading status.
+        self.handleProgressUpdates()
+        self.handleStatusUpdates()
     }
 
     private func observe(_ item: Item, accepted: inout BGTaskState.Accepted) {