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

Update to RingRTC v2.15.0

Browse Source
This commit is contained in:
Jim Gustafson 2021-11-19 16:05:25 -08:00 committed by Nora Trapp
parent 1647e6bdfd
commit 98485d1065
8 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Podfile.lock
View File

@ -119,10 +119,10 @@ PODS:
- SignalClient
- SignalCoreKit
- SwiftProtobuf
- SignalRingRTC (2.14.0):
- SignalRingRTC (2.15.0):
- SignalCoreKit
- SignalRingRTC/WebRTC (= 2.14.0)
- SignalRingRTC/WebRTC (2.14.0):
- SignalRingRTC/WebRTC (= 2.15.0)
- SignalRingRTC/WebRTC (2.15.0):
- SignalCoreKit
- SignalServiceKit (0.9.0):
- AFNetworking/NSURLSession
@ -419,7 +419,7 @@ SPEC CHECKSUMS:
SignalClient: 5e281d5917af94036553debe8450b209d603c280
SignalCoreKit: 87da14c58d57760793b892ff03838c5ef2ce1167
SignalMetadataKit: eb928ec98376ab5a6ef2108a7fcd3b2d792b8c65
SignalRingRTC: c294c7d630fc1de1de0bfe5b528eea60346798de
SignalRingRTC: f438ab0ad1081a6be3533fc5ebced5a38c507bc9
SignalServiceKit: e4617dcd4411b312ff4df451529e0d0c9c1d4f64
SQLCipher: d305a7bd9af4b64f095c79bdc1a1fa50f2a15116
SSZipArchive: 41455d4b8d2b6ab93990820b50dc697c2554a322

2
Pods

@ -1 +1 @@
Subproject commit 797922adcd3d1cb5e1a537c56d2a05aabe238be0
Subproject commit 3924b4f7aa399e52290f635e3d3926c3cd1f76d7

2
Signal/Signal-Info.plist
View File

@ -5,7 +5,7 @@
<key>BuildDetails</key>
<dict>
<key>WebRTCCommit</key>
<string>fab67827f25a43318e983f5a65f43c6b8b98201a Production build of v2.14.0</string>
<string>1ab326495ab7915dbd74fc3049c45a05fa038b37 Production build of v2.15.0</string>
</dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>

6
Signal/src/Calls/CallService.swift
View File

@ -1182,8 +1182,7 @@ extension CallService: CallManagerDelegate {
call: SignalCall,
destinationDeviceId: UInt32?,
hangupType: HangupType,
deviceId: UInt32,
useLegacyHangupMessage: Bool
deviceId: UInt32
) {
AssertIsOnMainThread()
owsAssertDebug(call.isIndividualCall)
@ -1194,8 +1193,7 @@ extension CallService: CallManagerDelegate {
call: call,
destinationDeviceId: destinationDeviceId,
hangupType: hangupType,
deviceId: deviceId,
useLegacyHangupMessage: useLegacyHangupMessage
deviceId: deviceId
)
}

19
Signal/src/Calls/Individual/IndividualCallService.swift
View File

@ -343,8 +343,7 @@ import CallKit
call: newCall,
destinationDeviceId: sourceDevice,
hangupType: .needPermission,
deviceId: localDeviceId,
useLegacyHangupMessage: true
deviceId: localDeviceId
)
// Store the call as a missed call for the local user. They will see it in the conversation
@ -404,7 +403,6 @@ import CallKit
messageAgeSec: messageAgeSec,
callMediaType: newCall.individualCall.offerMediaType.asCallMediaType,
localDevice: localDeviceId,
remoteSupportsMultiRing: supportsMultiRing,
isLocalDevicePrimary: isPrimaryDevice,
senderIdentityKey: identityKeys.contactIdentityKey,
receiverIdentityKey: identityKeys.localIdentityKey)
@ -437,7 +435,7 @@ import CallKit
}
do {
try callManager.receivedAnswer(sourceDevice: sourceDevice, callId: callId, opaque: opaque, remoteSupportsMultiRing: supportsMultiRing, senderIdentityKey: identityKeys.contactIdentityKey, receiverIdentityKey: identityKeys.localIdentityKey)
try callManager.receivedAnswer(sourceDevice: sourceDevice, callId: callId, opaque: opaque, senderIdentityKey: identityKeys.contactIdentityKey, receiverIdentityKey: identityKeys.localIdentityKey)
} catch {
owsFailDebug("error: \(error)")
if let currentCall = callService.currentCall, currentCall.individualCall?.callId == callId {
@ -843,11 +841,6 @@ import CallKit
// TODO - This should not be a failure.
call.individualCall.state = .localFailure
callService.terminate(call: call)
case .ignoreCallsFromNonMultiringCallers:
handleMissedCall(call)
call.individualCall.state = .localFailure
callService.terminate(call: call)
}
}
@ -976,7 +969,7 @@ import CallKit
}
}
public func callManager(_ callManager: CallService.CallManagerType, shouldSendHangup callId: UInt64, call: SignalCall, destinationDeviceId: UInt32?, hangupType: HangupType, deviceId: UInt32, useLegacyHangupMessage: Bool) {
public func callManager(_ callManager: CallService.CallManagerType, shouldSendHangup callId: UInt64, call: SignalCall, destinationDeviceId: UInt32?, hangupType: HangupType, deviceId: UInt32) {
AssertIsOnMainThread()
owsAssertDebug(call.isIndividualCall)
Logger.info("shouldSendHangup")
@ -999,11 +992,7 @@ import CallKit
}
let callMessage: OWSOutgoingCallMessage
if useLegacyHangupMessage {
callMessage = OWSOutgoingCallMessage(thread: call.individualCall.thread, legacyHangupMessage: try hangupBuilder.build(), destinationDeviceId: NSNumber(value: destinationDeviceId))
} else {
callMessage = OWSOutgoingCallMessage(thread: call.individualCall.thread, hangupMessage: try hangupBuilder.build(), destinationDeviceId: NSNumber(value: destinationDeviceId))
}
callMessage = OWSOutgoingCallMessage(thread: call.individualCall.thread, hangupMessage: try hangupBuilder.build(), destinationDeviceId: NSNumber(value: destinationDeviceId))
return Self.databaseStorage.write { transaction in
ThreadUtil.enqueueMessagePromise(

2
ThirdParty/RingRTC vendored

@ -1 +1 @@
Subproject commit 7bb68ef4f4d5240d346d543507b2948a334101db
Subproject commit d60e0d99f3a00c2bf8774dffb7fa626a43e95ebe

2
ThirdParty/SignalRingRTC.podspec vendored
View File

@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = "SignalRingRTC"
s.version = "2.14.0"
s.version = "2.15.0"
s.summary = "A Swift & Objective-C library used by the Signal iOS app for WebRTC interactions."
s.description = <<-DESC

2
ThirdParty/WebRTC vendored

@ -1 +1 @@
Subproject commit fab67827f25a43318e983f5a65f43c6b8b98201a
Subproject commit 1ab326495ab7915dbd74fc3049c45a05fa038b37