From 239862cae2c6a93c7f104b688b229c1e688692e4 Mon Sep 17 00:00:00 2001
From: Isaac <>
Date: Thu, 17 Apr 2025 20:04:24 +0400
Subject: [PATCH 1/3] Fix conference

(cherry picked from commit 56058e73f05318c5a46c959a8841519e078027f9)
---
 .../Sources/NotificationService.swift               |  2 +-
 submodules/TelegramUI/Sources/AppDelegate.swift     | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Telegram/NotificationService/Sources/NotificationService.swift b/Telegram/NotificationService/Sources/NotificationService.swift
index 4c15c2c122..49eccbd317 100644
--- a/Telegram/NotificationService/Sources/NotificationService.swift
+++ b/Telegram/NotificationService/Sources/NotificationService.swift
@@ -1298,7 +1298,7 @@ private final class NotificationServiceHandler {
                                     var voipPayload: [AnyHashable: Any] = [
                                         "group_call_id": "\(groupCallData.id)",
                                         "msg_id": "\(groupCallData.messageId)",
-                                        "video": "\(groupCallData.isVideo)",
+                                        "video": "\(groupCallData.isVideo ? 1 : 0)",
                                         "member_count": "\(groupCallData.memberCount)",
                                         "from_id": "\(groupCallData.fromId.id._internalGetInt64Value())",
                                         "from_title": groupCallData.fromTitle,
diff --git a/submodules/TelegramUI/Sources/AppDelegate.swift b/submodules/TelegramUI/Sources/AppDelegate.swift
index 299138d62f..6aa23853da 100644
--- a/submodules/TelegramUI/Sources/AppDelegate.swift
+++ b/submodules/TelegramUI/Sources/AppDelegate.swift
@@ -2168,12 +2168,19 @@ private func extractAccountManagerState(records: AccountRecordsView<TelegramAcco
         
         let phoneNumber = payloadJson["phoneNumber"] as? String
         
-        if let fromIdString = payloadJson["from_id"] as? String, let fromId = Int64(fromIdString), let groupCallIdString = payloadJson["group_call_id"] as? String, let groupCallId = Int64(groupCallIdString), let messageIdString = payloadJson["msg_id"] as? String, let messageId = Int32(messageIdString), let isVideoString = payloadJson["video"] as? String, let isVideo = Int32(isVideoString), let fromTitle = payloadJson["from_title"] as? String {
+        if let fromIdString = payloadJson["from_id"] as? String, let fromId = Int64(fromIdString), let groupCallIdString = payloadJson["group_call_id"] as? String, let groupCallId = Int64(groupCallIdString), let messageIdString = payloadJson["msg_id"] as? String, let messageId = Int32(messageIdString), let fromTitle = payloadJson["from_title"] as? String {
             guard let callKitIntegration = CallKitIntegration.shared else {
                 Logger.shared.log("App \(self.episodeId) PushRegistry", "CallKitIntegration is not available")
                 completion()
                 return
             }
+            
+            var isVideo = false
+            if let isVideoString = payloadJson["video"] as? String, let isVideoValue = Int32(isVideoString) {
+                isVideo = isVideoValue != 0
+            } else if let isVideoString = payloadJson["video"] as? String, let isVideoValue = Bool(isVideoString) {
+                isVideo = isVideoValue
+            }
 
             let fromPeerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt64Value(fromId))
             let messageId = MessageId(peerId: fromPeerId, namespace: Namespaces.Message.Cloud, id: messageId)
@@ -2199,7 +2206,7 @@ private func extractAccountManagerState(records: AccountRecordsView<TelegramAcco
                 stableId: groupCallId,
                 handle: "\(fromPeerId.id._internalGetInt64Value())",
                 phoneNumber: phoneNumber.flatMap(formatPhoneNumber),
-                isVideo: isVideo != 0,
+                isVideo: isVideo,
                 displayTitle: displayTitle,
                 completion: { error in
                     if let error = error {
@@ -2226,7 +2233,7 @@ private func extractAccountManagerState(records: AccountRecordsView<TelegramAcco
                     var processed = false
                     for (_, context, _) in activeAccounts.accounts {
                         if context.account.id == accountId {
-                            context.account.callSessionManager.addConferenceInvitationMessages(ids: [(messageId, IncomingConferenceTermporaryExternalInfo(callId: groupCallId, isVideo: isVideo != 0))])
+                            context.account.callSessionManager.addConferenceInvitationMessages(ids: [(messageId, IncomingConferenceTermporaryExternalInfo(callId: groupCallId, isVideo: isVideo))])
                             
                             /*disposable.set((context.account.callSessionManager.callState(internalId: internalId)
                             |> deliverOnMainQueue).start(next: { state in

From 0c7c73a3e9224b44fdab976837f9b052e1b2f0c3 Mon Sep 17 00:00:00 2001
From: Isaac <>
Date: Thu, 17 Apr 2025 22:01:19 +0400
Subject: [PATCH 2/3] Fix call panel

(cherry picked from commit ebdd7b37ed92b0e36a58ed8633c1f3ca1851f1ad)
---
 .../Sources/TelegramBaseController.swift                   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/submodules/TelegramBaseController/Sources/TelegramBaseController.swift b/submodules/TelegramBaseController/Sources/TelegramBaseController.swift
index 943489259b..07010fc4a8 100644
--- a/submodules/TelegramBaseController/Sources/TelegramBaseController.swift
+++ b/submodules/TelegramBaseController/Sources/TelegramBaseController.swift
@@ -287,10 +287,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
                         }
                     }
                     |> distinctUntilChanged(isEqual: { lhs, rhs in
-                        if lhs.0 != rhs.0 {
-                            return false
-                        }
-                        return true
+                        return lhs.0 == rhs.0
                     })
                     |> mapToSignal { activeCall, peer -> Signal<GroupCallPanelData?, NoError> in
                         guard let activeCall = activeCall else {
@@ -457,7 +454,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
             } else {
                 let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
                 groupCallAccessoryPanel = GroupCallNavigationAccessoryPanel(context: self.context, presentationData: presentationData, tapAction: { [weak self] in
-                    guard let strongSelf = self else {
+                    guard let strongSelf = self, let groupCallPanelData = strongSelf.groupCallPanelData else {
                         return
                     }
                     strongSelf.joinGroupCall(

From 587ac7bf00aa80c8ce3719abdb84e6a4e40342ae Mon Sep 17 00:00:00 2001
From: Isaac <>
Date: Fri, 18 Apr 2025 01:12:11 +0400
Subject: [PATCH 3/3] Update tgcalls

---
 submodules/TgVoipWebrtc/tgcalls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/TgVoipWebrtc/tgcalls b/submodules/TgVoipWebrtc/tgcalls
index 79d6b6612b..1348de6aa6 160000
--- a/submodules/TgVoipWebrtc/tgcalls
+++ b/submodules/TgVoipWebrtc/tgcalls
@@ -1 +1 @@
-Subproject commit 79d6b6612bdf06d5b1744937846aa2a4286886a7
+Subproject commit 1348de6aa6c07ed32354d3e26423c45304000a39