signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Clean up ahead of PR.

Browse Source
This commit is contained in:
Matthew Chen 2019-01-31 13:18:20 -05:00
parent 6b3fe04537
commit 41b7205b02
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Signal/src/call/CallService.swift
View File

@ -79,6 +79,7 @@ public enum CallError: Error {
case timeout(description: String)
case obsoleteCall(description: String)
case fatalError(description: String)
case messageSendFailure(underlyingError: Error)
}
// Should be roughly synced with Android client for consistency
@ -100,7 +101,7 @@ protocol CallServiceObserver: class {
}
protocol SignalCallDataDelegate: class {
func outgoingIceUpdateDidFail(call: SignalCall)
func outgoingIceUpdateDidFail(call: SignalCall, error: Error)
}
// Gather all per-call state in one place.
@ -261,7 +262,7 @@ private class SignalCallData: NSObject {
strongSelf.outgoingIceUpdatesInFlight = false
strongSelf.tryToSendIceUpdates()
}.catch { [weak self] (_) in
}.catch { [weak self] (error) in
AssertIsOnMainThread()
guard let strongSelf = self else {
@ -269,7 +270,7 @@ private class SignalCallData: NSObject {
}
strongSelf.outgoingIceUpdatesInFlight = false
strongSelf.delegate?.outgoingIceUpdateDidFail(call: strongSelf.call)
strongSelf.delegate?.outgoingIceUpdateDidFail(call: strongSelf.call, error: error)
}
sendPromise.retainUntilComplete()
}
@ -970,8 +971,6 @@ private class SignalCallData: NSObject {
private func handleIceConnected() {
AssertIsOnMainThread()
Logger.verbose("-----.")
guard let call = self.call else {
// This will only be called for the current peerConnectionClient, so
// fail the current call.
@ -1896,12 +1895,14 @@ private class SignalCallData: NSObject {
// MARK: - SignalCallDataDelegate
func outgoingIceUpdateDidFail(call: SignalCall) {
func outgoingIceUpdateDidFail(call: SignalCall, error: Error) {
AssertIsOnMainThread()
guard self.call == call else {
Logger.warn("obsolete call")
return
}
terminateCall()
handleFailedCall(failedCall: call, error: CallError.messageSendFailure(underlyingError: error))
}
}