Conference

submodules/AccountContext/Sources/ContactSelectionController.swift

@@ -99,6 +99,12 @@ public enum ContactListPeer: Equatable {
 }
 
 public final class ContactSelectionControllerParams {
+    public enum MultipleSelectionMode {
+        case disabled
+        case possible
+        case always
+    }
+    
     public let context: AccountContext
     public let updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)?
     public let mode: ContactSelectionControllerMode
@@ -107,7 +113,7 @@ public final class ContactSelectionControllerParams {
     public let options: Signal<[ContactListAdditionalOption], NoError>
     public let displayDeviceContacts: Bool
     public let displayCallIcons: Bool
-    public let multipleSelection: Bool
+    public let multipleSelection: MultipleSelectionMode
     public let requirePhoneNumbers: Bool
     public let allowChannelsInSearch: Bool
     public let confirmation: (ContactListPeer) -> Signal<Bool, NoError>
@@ -124,7 +130,7 @@ public final class ContactSelectionControllerParams {
         options: Signal<[ContactListAdditionalOption], NoError> = .single([]),
         displayDeviceContacts: Bool = false,
         displayCallIcons: Bool = false,
-        multipleSelection: Bool = false,
+        multipleSelection: MultipleSelectionMode = .disabled,
         requirePhoneNumbers: Bool = false,
         allowChannelsInSearch: Bool = false,
         confirmation: @escaping (ContactListPeer) -> Signal<Bool, NoError> = { _ in .single(true) },

submodules/CallListUI/Sources/CallListControllerNode.swift

@@ -525,7 +525,7 @@ final class CallListControllerNode: ASDisplayNode {
         |> mapToQueue { (updateAndType, state, groupCalls, showCallsTab, currentGroupCallPeerId) -> Signal<CallListNodeListViewTransition, NoError> in
             let (update, type) = updateAndType
             
-            let processedView = CallListNodeView(originalView: update.view, filteredEntries: callListNodeEntriesForView(view: update.view, displayOpenNewCall: mode == .tab, groupCalls: groupCalls, state: state, showSettings: showSettings, showCallsTab: showCallsTab, isRecentCalls: type == .all, currentGroupCallPeerId: currentGroupCallPeerId), presentationData: state.presentationData)
+            let processedView = CallListNodeView(originalView: update.view, filteredEntries: callListNodeEntriesForView(view: update.view, displayOpenNewCall: mode == .tab && type == .all, groupCalls: groupCalls, state: state, showSettings: showSettings, showCallsTab: showCallsTab, isRecentCalls: type == .all, currentGroupCallPeerId: currentGroupCallPeerId), presentationData: state.presentationData)
             let previous = previousView.swap(processedView)
             let previousType = previousType.swap(type)
                         

submodules/TelegramCallsUI/Sources/CallController.swift

@@ -517,6 +517,7 @@ public final class CallController: ViewController {
             },
             options: .single(options),
             displayCallIcons: true,
+            multipleSelection: .disabled,
             confirmation: { peer in
                 switch peer {
                 case let .peer(peer, _, _):

submodules/TelegramCallsUI/Sources/VideoChatScreen.swift

@@ -2706,6 +2706,15 @@ final class VideoChatScreenComponent: Component {
             } else if let expandedParticipantsVideoState = self.expandedParticipantsVideoState, !expandedParticipantsVideoState.isUIHidden {
                 displayVideoControlButton = false
             }
+            if case .audio = videoControlButtonContent {
+                if let (availableOutputs, _) = self.audioOutputState {
+                    if availableOutputs.count <= 0 {
+                        displayVideoControlButton = false
+                    }
+                } else {
+                    displayVideoControlButton = false
+                }
+            }
 
             let videoControlButtonSize = self.videoControlButton.update(
                 transition: transition,

submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift

@@ -1722,7 +1722,7 @@ final class StoryItemSetContainerSendMessage {
                     case .contact:
                         let theme = component.theme
                         let updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>) = (component.context.sharedContext.currentPresentationData.with({ $0 }).withUpdated(theme: theme), component.context.sharedContext.presentationData |> map { $0.withUpdated(theme: theme) })
-                        let contactsController = component.context.sharedContext.makeContactSelectionController(ContactSelectionControllerParams(context: component.context, updatedPresentationData: updatedPresentationData, title: { $0.Contacts_Title }, displayDeviceContacts: true, multipleSelection: true))
+                        let contactsController = component.context.sharedContext.makeContactSelectionController(ContactSelectionControllerParams(context: component.context, updatedPresentationData: updatedPresentationData, title: { $0.Contacts_Title }, displayDeviceContacts: true, multipleSelection: .always))
                         contactsController.presentScheduleTimePicker = { [weak self, weak view] completion in
                             guard let self, let view else {
                                 return

submodules/TelegramUI/Sources/ChatController.swift

@@ -2898,7 +2898,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 return
             }
             
-            if let currentGroupCallController = self.context.sharedContext as? VoiceChatController, case let .group(groupCall) = currentGroupCallController.call, let currentCallId = groupCall.callId, currentCallId == conferenceCall.callId {
+            if let currentGroupCallController = self.context.sharedContext.currentGroupCallController as? VoiceChatController, case let .group(groupCall) = currentGroupCallController.call, let currentCallId = groupCall.callId, currentCallId == conferenceCall.callId {
                 self.context.sharedContext.navigateToCurrentCall()
                 return
             }

submodules/TelegramUI/Sources/ChatControllerOpenAttachmentMenu.swift

@@ -424,7 +424,7 @@ extension ChatControllerImpl {
                         let _ = currentLocationController.swap(controller)
                     })
                 case .contact:
-                    let contactsController = ContactSelectionControllerImpl(ContactSelectionControllerParams(context: strongSelf.context, updatedPresentationData: strongSelf.updatedPresentationData, title: { $0.Contacts_Title }, displayDeviceContacts: true, multipleSelection: true, requirePhoneNumbers: true))
+                    let contactsController = ContactSelectionControllerImpl(ContactSelectionControllerParams(context: strongSelf.context, updatedPresentationData: strongSelf.updatedPresentationData, title: { $0.Contacts_Title }, displayDeviceContacts: true, multipleSelection: .always, requirePhoneNumbers: true))
                     contactsController.presentScheduleTimePicker = { [weak self] completion in
                         if let strongSelf = self {
                             strongSelf.presentScheduleTimePicker(completion: completion)
@@ -1620,7 +1620,7 @@ extension ChatControllerImpl {
     }
     
     func presentContactPicker() {
-        let contactsController = ContactSelectionControllerImpl(ContactSelectionControllerParams(context: self.context, updatedPresentationData: self.updatedPresentationData, title: { $0.Contacts_Title }, displayDeviceContacts: true, multipleSelection: true))
+        let contactsController = ContactSelectionControllerImpl(ContactSelectionControllerParams(context: self.context, updatedPresentationData: self.updatedPresentationData, title: { $0.Contacts_Title }, displayDeviceContacts: true, multipleSelection: .always))
         contactsController.navigationPresentation = .modal
         self.chatDisplayNode.dismissInput()
         self.effectiveNavigationController?.pushViewController(contactsController)

submodules/TelegramUI/Sources/ContactSelectionController.swift

@@ -40,7 +40,7 @@ class ContactSelectionControllerImpl: ViewController, ContactSelectionController
     private let options: Signal<[ContactListAdditionalOption], NoError>
     private let displayDeviceContacts: Bool
     private let displayCallIcons: Bool
-    private let multipleSelection: Bool
+    private let multipleSelection: ContactSelectionControllerParams.MultipleSelectionMode
     private let requirePhoneNumbers: Bool
     private let allowChannelsInSearch: Bool
     
@@ -153,15 +153,17 @@ class ContactSelectionControllerImpl: ViewController, ContactSelectionController
             }
         })
         
-        if !params.multipleSelection {
+        if self.multipleSelection != .always {
             self.searchContentNode = NavigationBarSearchContentNode(theme: self.presentationData.theme, placeholder: self.presentationData.strings.Common_Search, activate: { [weak self] in
                 self?.activateSearch()
             })
             self.navigationBar?.setContentNode(self.searchContentNode, animated: false)
         }
         
-        if params.multipleSelection {
+        if self.multipleSelection == .always {
             self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationCompactSearchIcon(self.presentationData.theme), style: .plain, target: self, action: #selector(self.beginSearch))
+        } else if self.multipleSelection == .possible {
+            self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Select, style: .plain, target: self, action: #selector(self.beginSelection))
         }
         
         self.getCurrentSendMessageContextMediaPreview = { [weak self] in
@@ -220,7 +222,7 @@ class ContactSelectionControllerImpl: ViewController, ContactSelectionController
     }
     
     override func loadDisplayNode() {
-        self.displayNode = ContactSelectionControllerNode(context: self.context, mode: self.mode, presentationData: self.presentationData, options: self.options, displayDeviceContacts: self.displayDeviceContacts, displayCallIcons: self.displayCallIcons, multipleSelection: self.multipleSelection, requirePhoneNumbers: self.requirePhoneNumbers, allowChannelsInSearch: self.allowChannelsInSearch, isPeerEnabled: self.isPeerEnabled)
+        self.displayNode = ContactSelectionControllerNode(context: self.context, mode: self.mode, presentationData: self.presentationData, options: self.options, displayDeviceContacts: self.displayDeviceContacts, displayCallIcons: self.displayCallIcons, multipleSelection: self.multipleSelection == .always, requirePhoneNumbers: self.requirePhoneNumbers, allowChannelsInSearch: self.allowChannelsInSearch, isPeerEnabled: self.isPeerEnabled)
         self._ready.set(self.contactsNode.contactListNode.ready)
         
         self.contactsNode.navigationBar = self.navigationBar
@@ -335,7 +337,7 @@ class ContactSelectionControllerImpl: ViewController, ContactSelectionController
             if let searchContentNode = self.searchContentNode as? NavigationBarSearchContentNode {
                 self.contactsNode.activateSearch(placeholderNode: searchContentNode.placeholderNode)
                 self.setDisplayNavigationBar(false, transition: .animated(duration: 0.5, curve: .spring))
-            } else if self.multipleSelection {
+            } else if self.multipleSelection == .always {
                 let contentNode = ContactsSearchNavigationContentNode(presentationData: self.presentationData, dismissSearch: { [weak self] in
                     if let strongSelf = self, let navigationBar = strongSelf.navigationBar, let searchContentNode = strongSelf.searchContentNode as? ContactsSearchNavigationContentNode {
                         searchContentNode.deactivate()

submodules/TelegramUI/Sources/OpenResolvedUrl.swift

@@ -394,6 +394,11 @@ func openResolvedUrlImpl(
         
             let _ = (signal
             |> deliverOnMainQueue).startStandalone(next: { [weak navigationController] resolvedCallLink in
+                if let currentGroupCallController = context.sharedContext.currentGroupCallController as? VoiceChatController, case let .group(groupCall) = currentGroupCallController.call, let currentCallId = groupCall.callId, currentCallId == resolvedCallLink.id {
+                    context.sharedContext.navigateToCurrentCall()
+                    return
+                }
+                
                 navigationController?.pushViewController(context.sharedContext.makeJoinSubjectScreen(context: context, mode: JoinSubjectScreenMode.groupCall(JoinSubjectScreenMode.GroupCall(
                     id: resolvedCallLink.id,
                     accessHash: resolvedCallLink.accessHash,