mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-08-01 07:57:01 +00:00
Merge branch 'temp-calls'
This commit is contained in:
commit
d58f52b896
@ -1 +1 @@
|
||||
c190c625502c4d5a9b1ac0d016da64ce
|
||||
44eed22b384449bcec8962f2fddbfebd
|
||||
|
@ -414,9 +414,9 @@ official_apple_pay_merchants = [
|
||||
"merchant.org.telegram.Best2pay.test",
|
||||
"merchant.psbank.test.telegramios",
|
||||
"merchant.psbank.prod.telegramios",
|
||||
#"merchant.org.telegram.billinenet.test",
|
||||
#"merchant.org.telegram.billinenet.prod",
|
||||
#"merchant.org.telegram.portmone.test",
|
||||
"merchant.org.telegram.billinenet.test",
|
||||
"merchant.org.telegram.billinenet.prod",
|
||||
"merchant.org.telegram.portmone.test",
|
||||
]
|
||||
|
||||
official_bundle_ids = [
|
||||
|
@ -79,6 +79,11 @@ private func callConnectionDescriptionsWebrtc(_ connection: CallSessionConnectio
|
||||
guard let id = idMapping[reflector.id] else {
|
||||
return []
|
||||
}
|
||||
#if DEBUG
|
||||
if id != 1 {
|
||||
return []
|
||||
}
|
||||
#endif
|
||||
var result: [OngoingCallConnectionDescriptionWebrtc] = []
|
||||
if !reflector.ip.isEmpty {
|
||||
result.append(OngoingCallConnectionDescriptionWebrtc(reflectorId: id, hasStun: false, hasTurn: true, hasTcp: reflector.isTcp, ip: reflector.ip, port: reflector.port, username: "reflector", password: hexString(reflector.peerTag)))
|
||||
@ -88,6 +93,11 @@ private func callConnectionDescriptionsWebrtc(_ connection: CallSessionConnectio
|
||||
}
|
||||
return result
|
||||
case let .webRtcReflector(reflector):
|
||||
#if DEBUG
|
||||
if "".isEmpty {
|
||||
return []
|
||||
}
|
||||
#endif
|
||||
var result: [OngoingCallConnectionDescriptionWebrtc] = []
|
||||
if !reflector.ip.isEmpty {
|
||||
result.append(OngoingCallConnectionDescriptionWebrtc(reflectorId: 0, hasStun: reflector.hasStun, hasTurn: reflector.hasTurn, hasTcp: false, ip: reflector.ip, port: reflector.port, username: reflector.username, password: reflector.password))
|
||||
|
@ -115,7 +115,9 @@ public:
|
||||
if (!_audioDeviceModule->Playing()) {
|
||||
_audioDeviceModule->InitPlayout();
|
||||
//_audioDeviceModule->InitRecording();
|
||||
_audioDeviceModule->InternalStartPlayout();
|
||||
if (_audioDeviceModule->PlayoutIsInitialized()) {
|
||||
_audioDeviceModule->InternalStartPlayout();
|
||||
}
|
||||
//_audioDeviceModule->InternalStartRecording();
|
||||
}
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
{
|
||||
"app": "9.2.1",
|
||||
"app": "9.2.2",
|
||||
"bazel": "5.3.1",
|
||||
"xcode": "14.1"
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user