fix: ios crash while close app

AgoraIO-Extensions · Jul 17, 2023 · a25010e · a25010e
1 parent 50f9a23
commit a25010e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/ios/Classes/RTMCallManager.swift b/ios/Classes/RTMCallManager.swift
@@ -13,19 +13,31 @@ class RTMCallManager: NSObject, AgoraRtmCallDelegate, FlutterStreamHandler {
     var eventChannel: FlutterEventChannel?
     var eventSink: FlutterEventSink?
 
-    var manager: AgoraRtmCallKit?
+    var client: AgoraRtmKit?
     var remoteInvitations: [Int: AgoraRtmRemoteInvitation] = [:]
     var localInvitations: [Int: AgoraRtmLocalInvitation] = [:]
+    var manager: AgoraRtmCallKit? {
+        get {
+            return client?.rtmCallKit
+        }
+    }
 
     init(_ client: AgoraRtmKit, _ clientIndex: Int, _ messenger: FlutterBinaryMessenger) {
         eventChannel = FlutterEventChannel(
             name: "io.agora.rtm.client\(clientIndex).call_manager",
             binaryMessenger: messenger
         )
-        manager = client.getRtmCall()
+        self.client = client
         super.init()
         eventChannel?.setStreamHandler(self)
-        manager?.callDelegate = self
+        self.manager?.callDelegate = self
+    }
+
+    deinit {
+        remoteInvitations.removeAll()
+        localInvitations.removeAll()
+        eventChannel = nil
+        client = nil
     }
 
     private func sendEvent(eventName: String, params: [String: Any?]) {

diff --git a/ios/Classes/SwiftAgoraRtmPlugin.swift b/ios/Classes/SwiftAgoraRtmPlugin.swift
@@ -26,6 +26,7 @@ public class SwiftAgoraRtmPlugin: NSObject, FlutterPlugin {
 
     public func detachFromEngine(for registrar: FlutterPluginRegistrar) {
         methodChannel.setMethodCallHandler(nil)
+        clients.removeAll()
     }
 
     public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {