[Fix]CallKit crash (#687)

GetStream · Feb 28, 2025 · 891efe5 · 891efe5
1 parent 07fe1c9
commit 891efe5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/Sources/StreamVideo/CallKit/CallKitPushNotificationAdapter.swift b/Sources/StreamVideo/CallKit/CallKitPushNotificationAdapter.swift
@@ -107,19 +107,17 @@ open class CallKitPushNotificationAdapter: NSObject, PKPushRegistryDelegate, Obs
                 "Received VoIP push notification with cid:\(content.cid) callerId:\(content.callerId) callerName:\(content.localizedCallerName)."
             )
 
-        Task { @MainActor [weak self] in
-            self?.callKitService.reportIncomingCall(
-                content.cid,
-                localizedCallerName: content.localizedCallerName,
-                callerId: content.callerId,
-                hasVideo: content.hasVideo,
-                completion: { error in
-                    if let error {
-                        log.error(error)
-                    }
+        callKitService.reportIncomingCall(
+            content.cid,
+            localizedCallerName: content.localizedCallerName,
+            callerId: content.callerId,
+            hasVideo: content.hasVideo,
+            completion: { error in
+                if let error {
+                    log.error(error)
                 }
-            )
-        }
+            }
+        )
     }
 
     /// Decodes push notification Payload to a type that the CallKit implementation can use.

diff --git a/Sources/StreamVideo/CallKit/CallKitService.swift b/Sources/StreamVideo/CallKit/CallKitService.swift
@@ -111,7 +111,6 @@ open class CallKitService: NSObject, CXProviderDelegate, @unchecked Sendable {
     ///   - callerId: The caller's identifier.
     ///   - hasVideo: Indicator if call is video or audio.
     ///   - completion: A closure to be called upon completion.
-    @MainActor
     open func reportIncomingCall(
         _ cid: String,
         localizedCallerName: String,
@@ -157,7 +156,7 @@ open class CallKitService: NSObject, CXProviderDelegate, @unchecked Sendable {
         Task {
             do {
                 if streamVideo.state.connection != .connected {
-                    let result = await Task { @MainActor in
+                    let result = await Task {
                         try await streamVideo.connect()
                     }.result
 
@@ -170,7 +169,7 @@ open class CallKitService: NSObject, CXProviderDelegate, @unchecked Sendable {
                 }
 
                 if streamVideo.state.ringingCall?.cId != callEntry.call.cId {
-                    Task { @MainActor in
+                    Task {
                         streamVideo.state.ringingCall = callEntry.call
                     }
                 }
@@ -576,7 +575,6 @@ open class CallKitService: NSObject, CXProviderDelegate, @unchecked Sendable {
         return provider
     }
 
-    @MainActor
     private func buildCallUpdate(
         cid: String,
         localizedCallerName: String,