Update demo app to use Task instead of ensureIsolated

laevandus · laevandus · commit 326a384265c1 · 2025-05-07T15:28:51.000+03:00
diff --git a/DemoApp/Extensions/MainActor+Extensions.swift b/DemoApp/Extensions/MainActor+Extensions.swift
diff --git a/DemoApp/Screens/Create Chat/CreateChatViewController.swift b/DemoApp/Screens/Create Chat/CreateChatViewController.swift
@@ -25,7 +25,7 @@ class CreateChatViewController: UIViewController {
 
             // Create the Channel on backend
             controller.synchronize { [weak self] error in
-                MainActor.ensureIsolated { [weak self] in
+                Task { @MainActor in
                     if let error = error {
                         self?.presentAlert(title: "Error when creating the channel", message: error.localizedDescription)
                         return
@@ -147,7 +147,7 @@ class CreateChatViewController: UIViewController {
         // Empty initial search to get all users
         searchController.search(term: nil) { [weak self] error in
             if error != nil {
-                MainActor.ensureIsolated { [weak self] in
+                Task { @MainActor in
                     self?.update(for: .error)
                 }
             }
@@ -241,7 +241,7 @@ class CreateChatViewController: UIViewController {
         operation = DispatchWorkItem { [weak self] in
             self?.searchController.search(term: sender.text) { [weak self] error in
                 if error != nil {
-                    MainActor.ensureIsolated { [weak self] in
+                    Task { @MainActor in
                         self?.update(for: .error)
                     }
                 }
diff --git a/DemoApp/Screens/Create Chat/NameGroupViewController.swift b/DemoApp/Screens/Create Chat/NameGroupViewController.swift
@@ -131,8 +131,8 @@ class NameGroupViewController: UIViewController {
                 name: name,
                 members: Set(selectedUsers.map(\.id))
             )
-            channelController?.synchronize { error in
-                MainActor.ensureIsolated { [weak self] in
+            channelController?.synchronize { [weak self] error in
+                Task { @MainActor in
                     if let error = error {
                         self?.presentAlert(title: "Error when creating the channel", message: error.localizedDescription)
                     } else {
diff --git a/DemoApp/Screens/DemoDraftMessageListVC.swift b/DemoApp/Screens/DemoDraftMessageListVC.swift
@@ -94,7 +94,7 @@ class DemoDraftMessageListVC: UIViewController, ThemeProvider {
         currentUserController.delegate = self
         loadingIndicator.startAnimating()
         currentUserController.loadDraftMessages { [weak self] _ in
-            MainActor.ensureIsolated { [weak self] in
+            Task { @MainActor in
                 self?.loadingIndicator.stopAnimating()
             }
         }
@@ -107,7 +107,7 @@ class DemoDraftMessageListVC: UIViewController, ThemeProvider {
 
         isPaginatingDrafts = true
         currentUserController.loadMoreDraftMessages { [weak self] _ in
-            MainActor.ensureIsolated { [weak self] in
+            Task { @MainActor in
                 self?.isPaginatingDrafts = false
             }
         }
diff --git a/DemoApp/Screens/MembersViewController.swift b/DemoApp/Screens/MembersViewController.swift
@@ -37,7 +37,7 @@ class MembersViewController: UITableViewController, ChatChannelMemberListControl
 
     private func synchronizeAndUpdateData() {
         membersController.synchronize { [weak self] _ in
-            MainActor.ensureIsolated { [weak self] in
+            Task { @MainActor in
                 self?.updateData()
             }
         }
diff --git a/DemoApp/StreamChat/Components/DemoChatChannelListRouter.swift b/DemoApp/StreamChat/Components/DemoChatChannelListRouter.swift
diff --git a/DemoApp/StreamChat/Components/DemoChatMessageActionsVC.swift b/DemoApp/StreamChat/Components/DemoChatMessageActionsVC.swift
@@ -37,16 +37,20 @@ final class DemoChatMessageActionsVC: ChatMessageActionsVC {
                     guard confirmed else { return }
 
                     self.messageController.deleteMessage { _ in
-                        let pollId = self.messageController.message?.poll?.id
-                        if let pollId, AppConfig.shared.demoAppConfig.shouldDeletePollOnMessageDeletion {
-                            let channelController = self.messageController.client.channelController(
-                                for: self.messageController.cid
-                            )
-                            channelController.deletePoll(pollId: pollId) { _ in
+                        Task { @MainActor in
+                            let pollId = self.messageController.message?.poll?.id
+                            if let pollId, AppConfig.shared.demoAppConfig.shouldDeletePollOnMessageDeletion {
+                                let channelController = self.messageController.client.channelController(
+                                    for: self.messageController.cid
+                                )
+                                channelController.deletePoll(pollId: pollId) { _ in
+                                    Task { @MainActor in
+                                        self.delegate?.chatMessageActionsVCDidFinish(self)
+                                    }
+                                }
+                            } else {
                                 self.delegate?.chatMessageActionsVCDidFinish(self)
                             }
-                        } else {
-                            self.delegate?.chatMessageActionsVCDidFinish(self)
                         }
                     }
                 }
@@ -65,7 +69,7 @@ final class DemoChatMessageActionsVC: ChatMessageActionsVC {
                         if let error = error {
                             log.error("Error when pinning message: \(error)")
                         }
-                        MainActor.ensureIsolated {
+                        Task { @MainActor in
                             self.delegate?.chatMessageActionsVCDidFinish(self)
                         }
                     }
@@ -74,7 +78,7 @@ final class DemoChatMessageActionsVC: ChatMessageActionsVC {
                         if let error = error {
                             log.error("Error when unpinning message: \(error)")
                         }
-                        MainActor.ensureIsolated {
+                        Task { @MainActor in
                             self.delegate?.chatMessageActionsVCDidFinish(self)
                         }
                     }
@@ -92,7 +96,7 @@ final class DemoChatMessageActionsVC: ChatMessageActionsVC {
                     guard confirmed else { return }
 
                     self.messageController.deleteMessage(hard: true) { _ in
-                        MainActor.ensureIsolated {
+                        Task { @MainActor in
                             self.delegate?.chatMessageActionsVCDidFinish(self)
                         }
                     }
@@ -107,7 +111,7 @@ final class DemoChatMessageActionsVC: ChatMessageActionsVC {
             action: { [weak self] _ in
                 guard let self = self else { return }
                 self.messageController.translate(to: .turkish) { _ in
-                    MainActor.ensureIsolated {
+                    Task { @MainActor in
                         self.delegate?.chatMessageActionsVCDidFinish(self)
                     }
                 }
diff --git a/DemoApp/StreamChat/Components/DemoChatThreadVC.swift b/DemoApp/StreamChat/Components/DemoChatThreadVC.swift
@@ -54,7 +54,7 @@ class DemoChatThreadVC: ChatThreadVC, CurrentChatUserControllerDelegate {
                         return
                     }
                     self.messageController.updateThread(title: title) { [weak self] result in
-                        MainActor.ensureIsolated { [weak self] in
+                        Task { @MainActor in
                             self?.thread = try? result.get()
                         }
                     }
@@ -65,7 +65,7 @@ class DemoChatThreadVC: ChatThreadVC, CurrentChatUserControllerDelegate {
             }),
             .init(title: "Load newest thread info", style: .default, handler: { [unowned self] _ in
                 self.messageController.loadThread { [weak self] result in
-                    MainActor.ensureIsolated { [weak self] in
+                    Task { @MainActor in
                         self?.thread = try? result.get()
                         self?.present(DebugObjectViewController(object: self?.thread), animated: true)
                     }
diff --git a/DemoApp/StreamChat/DemoAppCoordinator+DemoApp.swift b/DemoApp/StreamChat/DemoAppCoordinator+DemoApp.swift
@@ -218,7 +218,7 @@ private extension DemoAppCoordinator {
 
     func disconnect() {
         chat.client?.disconnect { [weak self] in
-            MainActor.ensureIsolated { [weak self] in
+            Task { @MainActor in
                 self?.showLogin(animated: true)
             }
         }
diff --git a/StreamChat.xcodeproj/project.pbxproj b/StreamChat.xcodeproj/project.pbxproj
@@ -255,7 +255,6 @@
 		4F1BEE7F2BE38B5500B6685C /* ReactionList_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F1BEE7E2BE38B5500B6685C /* ReactionList_Tests.swift */; };
 		4F1FB7D62C7DE22D00C47C2A /* ChatMessageAudioAttachment_Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F1FB7D52C7DE22D00C47C2A /* ChatMessageAudioAttachment_Mock.swift */; };
 		4F1FB7D82C7DEC6600C47C2A /* ChatMessageVideoAttachment_Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F1FB7D72C7DEC6600C47C2A /* ChatMessageVideoAttachment_Mock.swift */; };
-		4F2D5A922D92B9570098B5EB /* MainActor+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F2D5A912D92B9500098B5EB /* MainActor+Extensions.swift */; };
 		4F312D0E2C905A2E0073A1BC /* FlagRequestBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F312D0D2C905A2E0073A1BC /* FlagRequestBody.swift */; };
 		4F312D0F2C905A2E0073A1BC /* FlagRequestBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F312D0D2C905A2E0073A1BC /* FlagRequestBody.swift */; };
 		4F3554982C9C0F7200479229 /* StreamJSONDecoder_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F3554972C9C0F6500479229 /* StreamJSONDecoder_Tests.swift */; };
@@ -3209,7 +3208,6 @@
 		4F1BEE7E2BE38B5500B6685C /* ReactionList_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactionList_Tests.swift; sourceTree = "<group>"; };
 		4F1FB7D52C7DE22D00C47C2A /* ChatMessageAudioAttachment_Mock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatMessageAudioAttachment_Mock.swift; sourceTree = "<group>"; };
 		4F1FB7D72C7DEC6600C47C2A /* ChatMessageVideoAttachment_Mock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatMessageVideoAttachment_Mock.swift; sourceTree = "<group>"; };
-		4F2D5A912D92B9500098B5EB /* MainActor+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainActor+Extensions.swift"; sourceTree = "<group>"; };
 		4F312D0D2C905A2E0073A1BC /* FlagRequestBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlagRequestBody.swift; sourceTree = "<group>"; };
 		4F3554972C9C0F6500479229 /* StreamJSONDecoder_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StreamJSONDecoder_Tests.swift; sourceTree = "<group>"; };
 		4F427F652BA2F43200D92238 /* ConnectedUser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectedUser.swift; sourceTree = "<group>"; };
@@ -6703,7 +6701,6 @@
 		A3227E54284A479700EBE6CC /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
-				4F2D5A912D92B9500098B5EB /* MainActor+Extensions.swift */,
 				A3227E75284A4C6400EBE6CC /* MessageReactionType+Position.swift */,
 				A3227E58284A484300EBE6CC /* UIImage+Resized.swift */,
 				A3227E5A284A489000EBE6CC /* UIViewController+Alert.swift */,
@@ -11069,7 +11066,6 @@
 				AD7BE1682C1CB183000A5756 /* DebugObjectViewController.swift in Sources */,
 				ADD328612C06463600BAD0E9 /* DemoChatThreadListVC.swift in Sources */,
 				ADD3285A2C04DD8300BAD0E9 /* DemoAppTabBarController.swift in Sources */,
-				4F2D5A922D92B9570098B5EB /* MainActor+Extensions.swift in Sources */,
 				8440860D28FBFE520027849C /* DemoAppCoordinator+DemoApp.swift in Sources */,
 				647F66D5261E22C200111B19 /* DemoConnectionBannerView.swift in Sources */,
 				A31783DD285B79EB005009B9 /* Bundle+PushProvider.swift in Sources */,

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class CreateChatViewController: UIViewController {`
`25`	`25`
`26`	`26`	`// Create the Channel on backend`
`27`	`27`	`controller.synchronize { [weak self] error in`
`28`		`- MainActor.ensureIsolated { [weak self] in`
	`28`	`+ Task { @MainActor in`
`29`	`29`	`if let error = error {`
`30`	`30`	`self?.presentAlert(title: "Error when creating the channel", message: error.localizedDescription)`
`31`	`31`	`return`
`@@ -147,7 +147,7 @@ class CreateChatViewController: UIViewController {`
`147`	`147`	`// Empty initial search to get all users`
`148`	`148`	`searchController.search(term: nil) { [weak self] error in`
`149`	`149`	`if error != nil {`
`150`		`- MainActor.ensureIsolated { [weak self] in`
	`150`	`+ Task { @MainActor in`
`151`	`151`	`self?.update(for: .error)`
`152`	`152`	`}`
`153`	`153`	`}`
`@@ -241,7 +241,7 @@ class CreateChatViewController: UIViewController {`
`241`	`241`	`operation = DispatchWorkItem { [weak self] in`
`242`	`242`	`self?.searchController.search(term: sender.text) { [weak self] error in`
`243`	`243`	`if error != nil {`
`244`		`- MainActor.ensureIsolated { [weak self] in`
	`244`	`+ Task { @MainActor in`
`245`	`245`	`self?.update(for: .error)`
`246`	`246`	`}`
`247`	`247`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ class DemoDraftMessageListVC: UIViewController, ThemeProvider {`
`94`	`94`	`currentUserController.delegate = self`
`95`	`95`	`loadingIndicator.startAnimating()`
`96`	`96`	`currentUserController.loadDraftMessages { [weak self] _ in`
`97`		`- MainActor.ensureIsolated { [weak self] in`
	`97`	`+ Task { @MainActor in`
`98`	`98`	`self?.loadingIndicator.stopAnimating()`
`99`	`99`	`}`
`100`	`100`	`}`
`@@ -107,7 +107,7 @@ class DemoDraftMessageListVC: UIViewController, ThemeProvider {`
`107`	`107`
`108`	`108`	`isPaginatingDrafts = true`
`109`	`109`	`currentUserController.loadMoreDraftMessages { [weak self] _ in`
`110`		`- MainActor.ensureIsolated { [weak self] in`
	`110`	`+ Task { @MainActor in`
`111`	`111`	`self?.isPaginatingDrafts = false`
`112`	`112`	`}`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class MembersViewController: UITableViewController, ChatChannelMemberListControl`
`37`	`37`
`38`	`38`	`private func synchronizeAndUpdateData() {`
`39`	`39`	`membersController.synchronize { [weak self] _ in`
`40`		`- MainActor.ensureIsolated { [weak self] in`
	`40`	`+ Task { @MainActor in`
`41`	`41`	`self?.updateData()`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,16 +37,20 @@ final class DemoChatMessageActionsVC: ChatMessageActionsVC {`
`37`	`37`	`guard confirmed else { return }`
`38`	`38`
`39`	`39`	`self.messageController.deleteMessage { _ in`
`40`		`- let pollId = self.messageController.message?.poll?.id`
`41`		`- if let pollId, AppConfig.shared.demoAppConfig.shouldDeletePollOnMessageDeletion {`
`42`		`- let channelController = self.messageController.client.channelController(`
`43`		`- for: self.messageController.cid`
`44`		`- )`
`45`		`- channelController.deletePoll(pollId: pollId) { _ in`
	`40`	`+ Task { @MainActor in`
	`41`	`+ let pollId = self.messageController.message?.poll?.id`
	`42`	`+ if let pollId, AppConfig.shared.demoAppConfig.shouldDeletePollOnMessageDeletion {`
	`43`	`+ let channelController = self.messageController.client.channelController(`
	`44`	`+ for: self.messageController.cid`
	`45`	`+ )`
	`46`	`+ channelController.deletePoll(pollId: pollId) { _ in`
	`47`	`+ Task { @MainActor in`
	`48`	`+ self.delegate?.chatMessageActionsVCDidFinish(self)`
	`49`	`+ }`
	`50`	`+ }`
	`51`	`+ } else {`
`46`	`52`	`self.delegate?.chatMessageActionsVCDidFinish(self)`
`47`	`53`	`}`
`48`		`- } else {`
`49`		`- self.delegate?.chatMessageActionsVCDidFinish(self)`
`50`	`54`	`}`
`51`	`55`	`}`
`52`	`56`	`}`
`@@ -65,7 +69,7 @@ final class DemoChatMessageActionsVC: ChatMessageActionsVC {`
`65`	`69`	`if let error = error {`
`66`	`70`	`log.error("Error when pinning message: \(error)")`
`67`	`71`	`}`
`68`		`- MainActor.ensureIsolated {`
	`72`	`+ Task { @MainActor in`
`69`	`73`	`self.delegate?.chatMessageActionsVCDidFinish(self)`
`70`	`74`	`}`
`71`	`75`	`}`
`@@ -74,7 +78,7 @@ final class DemoChatMessageActionsVC: ChatMessageActionsVC {`
`74`	`78`	`if let error = error {`
`75`	`79`	`log.error("Error when unpinning message: \(error)")`
`76`	`80`	`}`
`77`		`- MainActor.ensureIsolated {`
	`81`	`+ Task { @MainActor in`
`78`	`82`	`self.delegate?.chatMessageActionsVCDidFinish(self)`
`79`	`83`	`}`
`80`	`84`	`}`
`@@ -92,7 +96,7 @@ final class DemoChatMessageActionsVC: ChatMessageActionsVC {`
`92`	`96`	`guard confirmed else { return }`
`93`	`97`
`94`	`98`	`self.messageController.deleteMessage(hard: true) { _ in`
`95`		`- MainActor.ensureIsolated {`
	`99`	`+ Task { @MainActor in`
`96`	`100`	`self.delegate?.chatMessageActionsVCDidFinish(self)`
`97`	`101`	`}`
`98`	`102`	`}`
`@@ -107,7 +111,7 @@ final class DemoChatMessageActionsVC: ChatMessageActionsVC {`
`107`	`111`	`action: { [weak self] _ in`
`108`	`112`	`guard let self = self else { return }`
`109`	`113`	`self.messageController.translate(to: .turkish) { _ in`
`110`		`- MainActor.ensureIsolated {`
	`114`	`+ Task { @MainActor in`
`111`	`115`	`self.delegate?.chatMessageActionsVCDidFinish(self)`
`112`	`116`	`}`
`113`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class DemoChatThreadVC: ChatThreadVC, CurrentChatUserControllerDelegate {`
`54`	`54`	`return`
`55`	`55`	`}`
`56`	`56`	`self.messageController.updateThread(title: title) { [weak self] result in`
`57`		`- MainActor.ensureIsolated { [weak self] in`
	`57`	`+ Task { @MainActor in`
`58`	`58`	`self?.thread = try? result.get()`
`59`	`59`	`}`
`60`	`60`	`}`
`@@ -65,7 +65,7 @@ class DemoChatThreadVC: ChatThreadVC, CurrentChatUserControllerDelegate {`
`65`	`65`	`}),`
`66`	`66`	`.init(title: "Load newest thread info", style: .default, handler: { [unowned self] _ in`
`67`	`67`	`self.messageController.loadThread { [weak self] result in`
`68`		`- MainActor.ensureIsolated { [weak self] in`
	`68`	`+ Task { @MainActor in`
`69`	`69`	`self?.thread = try? result.get()`
`70`	`70`	`self?.present(DebugObjectViewController(object: self?.thread), animated: true)`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ private extension DemoAppCoordinator {`
`218`	`218`
`219`	`219`	`func disconnect() {`
`220`	`220`	`chat.client?.disconnect { [weak self] in`
`221`		`- MainActor.ensureIsolated { [weak self] in`
	`221`	`+ Task { @MainActor in`
`222`	`222`	`self?.showLogin(animated: true)`
`223`	`223`	`}`
`224`	`224`	`}`