Merge branch 'experiments/group-calls'

submodules/SettingsUI/Sources/DebugController.swift

@@ -738,12 +738,12 @@ private enum DebugControllerEntry: ItemListNodeEntry {
             })
         case .voiceConference:
             return ItemListDisclosureItem(presentationData: presentationData, title: "Voice Conference (Test)", label: "", sectionId: self.section, style: .blocks, action: {
-                /*guard let context = arguments.context else {
+                guard let context = arguments.context else {
                     return
                 }
                 let controller = GroupCallController(context: context)
                 controller.navigationPresentation = .modal
-                arguments.pushController(controller)*/
+                arguments.pushController(controller)
             })
         case let .preferredVideoCodec(_, title, value, isSelected):
             return ItemListCheckboxItem(presentationData: presentationData, title: title, style: .right, checked: isSelected, zeroSeparatorInsets: false, sectionId: self.section, action: {
@@ -824,7 +824,7 @@ private func debugControllerEntries(presentationData: PresentationData, loggingS
     entries.append(.playerEmbedding(experimentalSettings.playerEmbedding))
     entries.append(.playlistPlayback(experimentalSettings.playlistPlayback))
     
-    //entries.append(.voiceConference)
+    entries.append(.voiceConference)
     
     let codecs: [(String, String?)] = [
         ("No Preference", nil),

submodules/TelegramCallsUI/Sources/GroupCallController.swift

@@ -10,8 +10,7 @@ import TelegramAudio
 import AccountContext
 
 public final class GroupCallController: ViewController {
-}
-/*    private final class Node: ViewControllerTracingNode {
+    private final class Node: ViewControllerTracingNode {
         private let context: AccountContext
         private let presentationData: PresentationData
         
@@ -146,4 +145,4 @@ public final class GroupCallController: ViewController {
         self.controllerNode.containerLayoutUpdated(layout, transition: transition)
     }
 }
-*/
+

submodules/TelegramVoip/Sources/GroupCallContext.swift

@@ -2,7 +2,7 @@ import Foundation
 import SwiftSignalKit
 import TgVoipWebrtc
 
-/*private final class ContextQueueImpl: NSObject, OngoingCallThreadLocalContextQueueWebrtc {
+private final class ContextQueueImpl: NSObject, OngoingCallThreadLocalContextQueueWebrtc {
     private let queue: Queue
     
     init(queue: Queue) {
@@ -1467,4 +1467,4 @@ public final class GroupCallContext {
         }
     }
 }
-*/
+

submodules/TgVoipWebrtc/Sources/GroupCallThreadLocalContext.mm

@@ -1,7 +1,7 @@
 
 #import <TgVoipWebrtc/GroupCallThreadLocalContext.h>
 
-/*#import "group/GroupInstanceImpl.h"
+#import "group/GroupInstanceImpl.h"
 
 @interface GroupCallThreadLocalContext () {
     id<OngoingCallThreadLocalContextQueueWebrtc> _queue;
@@ -55,4 +55,4 @@
 }
 
 @end
-*/
+