From 6beee7c0121898d0fc5d653abb86ec471dc53235 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 4 May 2017 13:52:25 -0400 Subject: [PATCH] verify peerconnection at proper time // FREEBIE --- Signal/src/call/CallService.swift | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift index e78ad3904..1bf9d23af 100644 --- a/Signal/src/call/CallService.swift +++ b/Signal/src/call/CallService.swift @@ -282,13 +282,6 @@ protocol CallServiceObserver: class { callRecord.save() call.callRecord = callRecord - guard self.peerConnectionClient == nil else { - let errorDescription = "\(TAG) peerconnection was unexpectedly already set." - Logger.error(errorDescription) - call.state = .localFailure - return Promise(error: CallError.assertionError(description: errorDescription)) - } - return getIceServers().then { iceServers -> Promise in Logger.debug("\(self.TAG) got ice servers:\(iceServers)") @@ -296,11 +289,15 @@ protocol CallServiceObserver: class { throw CallError.obsoleteCall(description:"obsolete call in \(#function)") } + guard self.peerConnectionClient == nil else { + let errorDescription = "\(self.TAG) peerconnection was unexpectedly already set." + Logger.error(errorDescription) + throw CallError.assertionError(description: errorDescription) + } + let useTurnOnly = Environment.getCurrent().preferences.doCallsHideIPAddress() let peerConnectionClient = PeerConnectionClient(iceServers: iceServers, delegate: self, callDirection: .outgoing, useTurnOnly: useTurnOnly) - - assert(self.peerConnectionClient == nil, "Unexpected PeerConnectionClient instance") Logger.debug("\(self.TAG) setting peerConnectionClient in \(#function)") self.peerConnectionClient = peerConnectionClient