T18656231: Crash when receiving call while app killed

cherry picked MEET-4253: CallKit crashes with Do not disturb commit 6e891fd # Conflicts: # iMEGA/CallsManagement/CallsCoordinator.swift
meganz · Oct 15, 2024 · 674ad73 · 674ad73
1 parent bb52129
commit 674ad73
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/iMEGA/AppDelegate/AppDelegate+Additions.swift b/iMEGA/AppDelegate/AppDelegate+Additions.swift
@@ -655,7 +655,8 @@ extension AppDelegate {
             voIpTokenUseCase: VoIPTokenUseCase(repo: VoIPTokenRepository.newRepo),
             megaHandleUseCase: MEGAHandleUseCase(repo: MEGAHandleRepository.newRepo),
             logger: {
-                CrashlyticsLogger.log(category: .calls, $0)
+                CrashlyticsLogger.log($0)
+                MEGALogDebug($0)
             }
         )
     }

diff --git a/iMEGA/CallsManagement/CallsCoordinator.swift b/iMEGA/CallsManagement/CallsCoordinator.swift
@@ -6,7 +6,6 @@ import MEGADomain
 import MEGAL10n
 import MEGAPresentation
 
-@MainActor
 protocol CallsCoordinatorFactoryProtocol {
     func makeCallsCoordinator(
         scheduler: AnySchedulerOf<DispatchQueue>,
@@ -76,7 +75,6 @@ struct CallKitProviderDelegateProvider: CallKitProviderDelegateProviding {
     }
 }
 
-@MainActor
 @objc final class CallsCoordinator: NSObject {
     private let callUseCase: any CallUseCaseProtocol
     private let callUpdateUseCase: any CallUpdateUseCaseProtocol
@@ -100,7 +98,7 @@ struct CallKitProviderDelegateProvider: CallKitProviderDelegateProviding {
     var incomingCallForUnknownChat: IncomingCallForUnknownChat?
 
     let scheduler: AnySchedulerOf<DispatchQueue>
-
+    
     @PreferenceWrapper(key: .presentPasscodeLater, defaultValue: false, useCase: PreferenceUseCase.default)
     var presentPasscodeLater: Bool
 
@@ -138,7 +136,7 @@ struct CallKitProviderDelegateProvider: CallKitProviderDelegateProviding {
             callCoordinator: self,
             callManager: callManager
         )
-
+        
         onCallUpdateListener()
         monitorOnChatConnectionStateUpdate()
     }
@@ -322,10 +320,12 @@ struct CallKitProviderDelegateProvider: CallKitProviderDelegateProviding {
     }
 
     private func startCallUI(chatRoom: ChatRoomEntity, call: CallEntity, isSpeakerEnabled: Bool) {
-        MeetingContainerRouter(presenter: UIApplication.mnz_presentingViewController(),
-                               chatRoom: chatRoom,
-                               call: call,
-                               isSpeakerEnabled: isSpeakerEnabled).start()
+        Task {
+            await MeetingContainerRouter(presenter: UIApplication.mnz_presentingViewController(),
+                                         chatRoom: chatRoom,
+                                         call: call,
+                                         isSpeakerEnabled: isSpeakerEnabled).start()
+        }
     }
 
     private func isWaitingRoomOpened(inChatRoom chatRoom: ChatRoomEntity) -> Bool {
@@ -463,11 +463,15 @@ extension CallsCoordinator: CallsCoordinatorProtocol {
         }
 
         providerDelegate?.provider.reportNewIncomingCall(with: incomingCallUUID, update: update) { [weak self] error in
-            guard error == nil else {
+            if let error {
+                CrashlyticsLogger.log("[CallKit] Provider Error reporting incoming call: \(String(describing: error))")
                 MEGALogError("[CallKit] Provider Error reporting incoming call: \(String(describing: error))")
-                return
+                if (error as NSError?)?.code == CXErrorCodeIncomingCallError.Code.filteredByDoNotDisturb.rawValue {
+                    MEGALogDebug("[CallKit] Do not disturb enabled")
+                }
+            } else {
+                self?.checkIfIncomingCallHasBeenAlreadyAnsweredElsewhere(for: chatId)
             }
-            self?.checkIfIncomingCallHasBeenAlreadyAnsweredElsewhere(for: chatId)
             completion()
         }
     }

diff --git a/iMEGA/CallsManagement/CallsCoordinatorProtocol.swift b/iMEGA/CallsManagement/CallsCoordinatorProtocol.swift
@@ -2,8 +2,7 @@ import MEGADomain
 
 /// Define methods to coordinate call actions from CallManagerProtocol
 /// When manager triggers an action and it is performed by a provider (CallKit basically, but simulator should manage it in different way),
-///  the coordinator implementation will execute the corresponding event in the ChatSDK (start, mute, end call...)
-@MainActor
+///  the coordinator implementation will execute the corresponding event in the ChatSDK (start, mute, end call....)
 protocol CallsCoordinatorProtocol: AnyObject {
     func startCall(_ callActionSync: CallActionSync) async -> Bool
     func answerCall(_ callActionSync: CallActionSync) async -> Bool

diff --git a/iMEGA/CallsManagement/VoIP/VoIPPushDelegate.swift b/iMEGA/CallsManagement/VoIP/VoIPPushDelegate.swift
@@ -68,9 +68,7 @@ import PushKit
 
         if isVoIPPush(for: payload) {
             logger("[VoIPPushDelegate] correct type of payload")
-            Task { @MainActor in
-                callsCoordinator.reportIncomingCall(in: chatId, completion: completion)
-            }
+            callsCoordinator.reportIncomingCall(in: chatId, completion: completion)
         } else {
             logger("[VoIPPushDelegate] wrong type of payload")
         }