diff --git a/Random.txt b/Random.txt index e1f36b1340..c6648d1db0 100644 --- a/Random.txt +++ b/Random.txt @@ -1 +1 @@ -c190c625502c4d5a9b1ac0d016da64ce +44eed22b384449bcec8962f2fddbfebd diff --git a/Telegram/BUILD b/Telegram/BUILD index ce29f30dd0..3ec5079743 100644 --- a/Telegram/BUILD +++ b/Telegram/BUILD @@ -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 = [ diff --git a/submodules/TelegramVoip/Sources/OngoingCallContext.swift b/submodules/TelegramVoip/Sources/OngoingCallContext.swift index 5b8e2e0e4a..15ff1892e0 100644 --- a/submodules/TelegramVoip/Sources/OngoingCallContext.swift +++ b/submodules/TelegramVoip/Sources/OngoingCallContext.swift @@ -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)) diff --git a/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm b/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm index 01972c1e7f..907e01cd87 100644 --- a/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm +++ b/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm @@ -115,7 +115,9 @@ public: if (!_audioDeviceModule->Playing()) { _audioDeviceModule->InitPlayout(); //_audioDeviceModule->InitRecording(); - _audioDeviceModule->InternalStartPlayout(); + if (_audioDeviceModule->PlayoutIsInitialized()) { + _audioDeviceModule->InternalStartPlayout(); + } //_audioDeviceModule->InternalStartRecording(); } } diff --git a/versions.json b/versions.json index 842d73869c..3820859635 100644 --- a/versions.json +++ b/versions.json @@ -1,5 +1,5 @@ { - "app": "9.2.1", + "app": "9.2.2", "bazel": "5.3.1", "xcode": "14.1" }