Do not use the async API

Author: crazytonyli

WordPress/Classes/Services/BloggingPromptsService.swift

@@ -330,13 +330,14 @@ private extension BloggingPromptsService {
     /// - Parameters:
     ///   - remoteSettings: The blogging prompt settings from the remote.
     ///   - completion: Closure to be called on completion.
-    func saveSettings(_ remoteSettings: RemoteBloggingPromptsSettings, completion: @MainActor @escaping () -> Void) {
-        Task {
-            await contextManager.save { derivedContext in
-                let settings = self.loadSettings(context: derivedContext) ?? BloggingPromptSettings(context: derivedContext)
-                settings.configure(with: remoteSettings, siteID: self.siteID.int32Value, context: derivedContext)
+    func saveSettings(_ remoteSettings: RemoteBloggingPromptsSettings, completion: @escaping () -> Void) {
+        contextManager.save { derivedContext in
+            let settings = self.loadSettings(context: derivedContext) ?? BloggingPromptSettings(context: derivedContext)
+            settings.configure(with: remoteSettings, siteID: self.siteID.int32Value, context: derivedContext)
+        } completion: {
+            DispatchQueue.main.async {
+                completion()
             }
-            await completion()
         }
     }
 

WordPress/Classes/Services/CommentService+Likes.swift

@@ -94,17 +94,15 @@ private extension CommentService {
             return
         }
 
-        Task {
-            await ContextManager.shared.save { derivedContext in
-                let likers = remoteLikeUsers.map { remoteUser in
-                    LikeUserHelper.createOrUpdateFrom(remoteUser: remoteUser, context: derivedContext)
-                }
-
-                if purgeExisting {
-                    self.deleteExistingUsersFor(commentID: commentID, siteID: siteID, from: derivedContext, likesToKeep: likers)
-                }
+        ContextManager.shared.save { derivedContext in
+            let likers = remoteLikeUsers.map { remoteUser in
+                LikeUserHelper.createOrUpdateFrom(remoteUser: remoteUser, context: derivedContext)
             }
 
+            if purgeExisting {
+                self.deleteExistingUsersFor(commentID: commentID, siteID: siteID, from: derivedContext, likesToKeep: likers)
+            }
+        } completion: {
             DispatchQueue.main.async {
                 onComplete()
             }

WordPress/Classes/Services/PostService+Likes.swift

@@ -94,17 +94,15 @@ private extension PostService {
             return
         }
 
-        Task {
-            await ContextManager.shared.save { derivedContext in
-                let likers = remoteLikeUsers.map { remoteUser in
-                    LikeUserHelper.createOrUpdateFrom(remoteUser: remoteUser, context: derivedContext)
-                }
-
-                if purgeExisting {
-                    self.deleteExistingUsersFor(postID: postID, siteID: siteID, from: derivedContext, likesToKeep: likers)
-                }
+        ContextManager.shared.save { derivedContext in
+            let likers = remoteLikeUsers.map { remoteUser in
+                LikeUserHelper.createOrUpdateFrom(remoteUser: remoteUser, context: derivedContext)
             }
 
+            if purgeExisting {
+                self.deleteExistingUsersFor(postID: postID, siteID: siteID, from: derivedContext, likesToKeep: likers)
+            }
+        } completion: {
             DispatchQueue.main.async {
                 onComplete()
             }