Merge branch 'mkirk/call-missing-retain' into master

6 years ago · ab9e959613
parent 5a6c2d32ff 5b8d712add
commit ab9e959613
1 changed files with 7 additions and 6 deletions
--- a/Signal/src/call/PeerConnectionClient.swift
+++ b/Signal/src/call/PeerConnectionClient.swift
@ -674,12 +674,13 @@ class PeerConnectionClient: NSObject, RTCPeerConnectionDelegate, RTCDataChannelD

            let hardenedSessionDescription = HardenedRTCSessionDescription(rtcSessionDescription: sessionDescription)

-            strongSelf.setLocalSessionDescriptionInternal(hardenedSessionDescription)
-                .done(on: PeerConnectionClient.signalingQueue) {
-                    resolver.fulfill(hardenedSessionDescription)
-                }.catch { error in
-                    resolver.reject(error)
-            }
+            firstly {
+                strongSelf.setLocalSessionDescriptionInternal(hardenedSessionDescription)
+            }.done(on: PeerConnectionClient.signalingQueue) {
+                resolver.fulfill(hardenedSessionDescription)
+            }.catch { error in
+                resolver.reject(error)
+            }.retainUntilComplete()
        }

        PeerConnectionClient.signalingQueue.async {