Conference improvements

Author: Isaac

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -14188,3 +14188,8 @@ Sorry for the inconvenience.";
 "SendInviteLink.TextCallsRestrictedMultipleUsers_1" = "{user_list}, and **%d** more person do not accept calls.";
 "SendInviteLink.TextCallsRestrictedMultipleUsers_any" = "{user_list}, and **%d** more people do not accept calls.";
 "SendInviteLink.TextCallsRestrictedSendInviteLink" = "You can try to send an invite link instead.";
+
+"Call.VoiceChatInProgressConferenceMessage" = "Leave voice chat in %1$@ and start a conference?";
+"Call.LiveStreamInProgressConferenceMessage" = "Leave live stream in %1$@ and start a conference?";
+
+"VoiceChat.RemoveConferencePeerConfirmation" = "Are you sure you want to remove %@ from this call?";

submodules/AccountContext/Sources/AccountContext.swift

@@ -964,14 +964,16 @@ public enum JoinSubjectScreenMode {
         public let inviter: EnginePeer?
         public let members: [EnginePeer]
         public let totalMemberCount: Int
+        public let info: JoinCallLinkInformation
 
-        public init(id: Int64, accessHash: Int64, slug: String, inviter: EnginePeer?, members: [EnginePeer], totalMemberCount: Int) {
+        public init(id: Int64, accessHash: Int64, slug: String, inviter: EnginePeer?, members: [EnginePeer], totalMemberCount: Int, info: JoinCallLinkInformation) {
             self.id = id
             self.accessHash = accessHash
             self.slug = slug
             self.inviter = inviter
             self.members = members
             self.totalMemberCount = totalMemberCount
+            self.info = info
         }
     }
 
@@ -1325,6 +1327,7 @@ public protocol AccountContext: AnyObject {
 
     func scheduleGroupCall(peerId: PeerId, parentController: ViewController)
     func joinGroupCall(peerId: PeerId, invite: String?, requestJoinAsPeerId: ((@escaping (PeerId?) -> Void) -> Void)?, activeCall: EngineGroupCallDescription)
+    func joinConferenceCall(call: JoinCallLinkInformation, isVideo: Bool)
     func requestCall(peerId: PeerId, isVideo: Bool, completion: @escaping () -> Void)
 }
 

submodules/AccountContext/Sources/PresentationCallManager.swift

@@ -579,6 +579,7 @@ public protocol PresentationCallManager: AnyObject {
         initialCall: EngineGroupCallDescription,
         reference: InternalGroupCallReference,
         beginWithVideo: Bool,
-        invitePeerIds: [EnginePeer.Id]
-    )
+        invitePeerIds: [EnginePeer.Id],
+        endCurrentIfAny: Bool
+    ) -> JoinGroupCallManagerResult
 }

submodules/CallListUI/Sources/CallListController.swift

@@ -210,7 +210,7 @@ public final class CallListController: TelegramBaseController {
     }
 
     private func createGroupCall(peerIds: [EnginePeer.Id], isVideo: Bool, completion: (() -> Void)? = nil) {
-        self.view.endEditing(true)
+        self.view.window?.endEditing(true)
 
         guard !self.presentAccountFrozenInfoIfNeeded() else {
             return
@@ -264,7 +264,7 @@ public final class CallListController: TelegramBaseController {
                 guard let self else {
                     return
                 }
-                self.context.sharedContext.callManager?.joinConferenceCall(
+                let _ = self.context.sharedContext.callManager?.joinConferenceCall(
                     accountContext: self.context,
                     initialCall: EngineGroupCallDescription(
                         id: call.callInfo.id,
@@ -276,7 +276,8 @@ public final class CallListController: TelegramBaseController {
                     ),
                     reference: .id(id: call.callInfo.id, accessHash: call.callInfo.accessHash),
                     beginWithVideo: isVideo,
-                    invitePeerIds: peerIds
+                    invitePeerIds: peerIds,
+                    endCurrentIfAny: true
                 )
                 completion?()
             }
@@ -712,20 +713,7 @@ public final class CallListController: TelegramBaseController {
             guard let self else {
                 return
             }
-            self.context.sharedContext.callManager?.joinConferenceCall(
-                accountContext: self.context,
-                initialCall: EngineGroupCallDescription(
-                    id: resolvedCallLink.id,
-                    accessHash: resolvedCallLink.accessHash,
-                    title: nil,
-                    scheduleTimestamp: nil,
-                    subscribedToScheduled: false,
-                    isStream: false
-                ),
-                reference: .message(id: message.id),
-                beginWithVideo: conferenceCall.flags.contains(.isVideo),
-                invitePeerIds: []
-            )
+            self.context.joinConferenceCall(call: resolvedCallLink, isVideo: conferenceCall.flags.contains(.isVideo))
         }, error: { [weak self] error in
             guard let self else {
                 return

submodules/ContactListUI/Sources/ContactListNode.swift

@@ -799,7 +799,7 @@ private func contactListNodeEntries(accountPeer: EnginePeer?, peers: [ContactLis
     return entries
 }
 
-private func preparedContactListNodeTransition(context: AccountContext, presentationData: PresentationData, from fromEntries: [ContactListNodeEntry], to toEntries: [ContactListNodeEntry], interaction: ContactListNodeInteraction, firstTime: Bool, isEmpty: Bool, generateIndexSections: Bool, animation: ContactListAnimation, isSearch: Bool) -> ContactsListNodeTransition {
+private func preparedContactListNodeTransition(context: AccountContext, presentationData: PresentationData, from fromEntries: [ContactListNodeEntry], to toEntries: [ContactListNodeEntry], interaction: ContactListNodeInteraction, firstTime: Bool, isEmpty: Bool, hasOptions: Bool, generateIndexSections: Bool, animation: ContactListAnimation, isSearch: Bool) -> ContactsListNodeTransition {
     let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries)
 
     let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) }
@@ -848,7 +848,7 @@ private func preparedContactListNodeTransition(context: AccountContext, presenta
         scrollToItem = ListViewScrollToItem(index: 0, position: .top(-50.0), animated: false, curve: .Default(duration: 0.0), directionHint: .Up)
     }
 
-    return ContactsListNodeTransition(deletions: deletions, insertions: insertions, updates: updates, indexSections: indexSections, firstTime: firstTime, isEmpty: isEmpty, scrollToItem: scrollToItem, animation: animation)
+    return ContactsListNodeTransition(deletions: deletions, insertions: insertions, updates: updates, indexSections: indexSections, firstTime: firstTime, isEmpty: isEmpty, hasOptions: hasOptions, scrollToItem: scrollToItem, animation: animation)
 }
 
 private struct ContactsListNodeTransition {
@@ -858,6 +858,7 @@ private struct ContactsListNodeTransition {
     let indexSections: [String]
     let firstTime: Bool
     let isEmpty: Bool
+    let hasOptions: Bool
     let scrollToItem: ListViewScrollToItem?
     let animation: ContactListAnimation
 }
@@ -1184,7 +1185,7 @@ public final class ContactListNode: ASDisplayNode {
             authorizeImpl?()
         }, openPrivacyPolicy: {
             openPrivacyPolicyImpl?()
-        })
+        }, filterHitTest: true)
         self.authorizationNode.isHidden = true
 
         super.init()
@@ -1644,7 +1645,7 @@ public final class ContactListNode: ASDisplayNode {
 
                             let entries = contactListNodeEntries(accountPeer: nil, peers: peers, presences: localPeersAndStatuses.1, presentation: presentation, selectionState: selectionState, theme: presentationData.theme, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, sortOrder: presentationData.nameSortOrder, displayOrder: presentationData.nameDisplayOrder, disabledPeerIds: disabledPeerIds, peerRequiresPremiumForMessaging: peerRequiresPremiumForMessaging, peersWithStories: [:], authorizationStatus: .allowed, warningSuppressed: (true, true), displaySortOptions: false, displayCallIcons: displayCallIcons, storySubscriptions: nil, topPeers: [], topPeersPresentation: .none, isPeerEnabled: isPeerEnabled, interaction: interaction)
                             let previous = previousEntries.swap(entries)
-                            return .single(preparedContactListNodeTransition(context: context, presentationData: presentationData, from: previous ?? [], to: entries, interaction: interaction, firstTime: previous == nil, isEmpty: false, generateIndexSections: generateSections, animation: .none, isSearch: isSearch))
+                            return .single(preparedContactListNodeTransition(context: context, presentationData: presentationData, from: previous ?? [], to: entries, interaction: interaction, firstTime: previous == nil, isEmpty: false, hasOptions: false, generateIndexSections: generateSections, animation: .none, isSearch: isSearch))
                         }
 
                         if OSAtomicCompareAndSwap32(1, 0, &firstTime) {
@@ -1885,7 +1886,7 @@ public final class ContactListNode: ASDisplayNode {
                             animation = .none
                         }
 
-                        return .single(preparedContactListNodeTransition(context: context, presentationData: presentationData, from: previous ?? [], to: entries, interaction: interaction, firstTime: previous == nil, isEmpty: isEmpty, generateIndexSections: generateSections, animation: animation, isSearch: isSearch))
+                        return .single(preparedContactListNodeTransition(context: context, presentationData: presentationData, from: previous ?? [], to: entries, interaction: interaction, firstTime: previous == nil, isEmpty: isEmpty, hasOptions: optionsCount != 0, generateIndexSections: generateSections, animation: animation, isSearch: isSearch))
                     }
 
                     if OSAtomicCompareAndSwap32(1, 0, &firstTime) {
@@ -1921,7 +1922,7 @@ public final class ContactListNode: ASDisplayNode {
                         authorizeImpl?()
                     }, openPrivacyPolicy: {
                         openPrivacyPolicyImpl?()
-                    })
+                    }, filterHitTest: true)
                     strongSelf.authorizationNode.isHidden = authorizationPreviousHidden
                     strongSelf.addSubnode(strongSelf.authorizationNode)
 
@@ -2125,7 +2126,7 @@ public final class ContactListNode: ASDisplayNode {
                     }
                 })
 
-                self.listNode.isHidden = self.displayPermissionPlaceholder && transition.isEmpty
+                self.listNode.isHidden = self.displayPermissionPlaceholder && (transition.isEmpty && !transition.hasOptions)
                 self.authorizationNode.isHidden = !transition.isEmpty || !self.displayPermissionPlaceholder
             }
         }

submodules/InviteLinksUI/Sources/InviteLinkInviteController.swift

@@ -589,6 +589,8 @@ public final class InviteLinkInviteController: ViewController {
                                     }
                                     return false
                                 }), in: .window(.root))
+                                
+                                strongSelf.controller?.dismiss()
                             }
                         })
                     }

submodules/Postbox/Sources/SqliteValueBox.swift

@@ -149,7 +149,7 @@ struct SqlitePreparedStatement {
     }
 }
 
-private let dabaseFileNames: [String] = [
+private let databaseFileNames: [String] = [
     "db_sqlite",
     "db_sqlite-shm",
     "db_sqlite-wal"
@@ -194,7 +194,6 @@ public final class SqliteValueBox: ValueBox {
     private var insertOrIgnorePrimaryKeyStatements: [Int32 : SqlitePreparedStatement] = [:]
     private var insertOrIgnoreIndexKeyStatements: [Int32 : SqlitePreparedStatement] = [:]
     private var deleteStatements: [Int32 : SqlitePreparedStatement] = [:]
-    private var moveStatements: [Int32 : SqlitePreparedStatement] = [:]
     private var copyStatements: [TablePairKey : SqlitePreparedStatement] = [:]
     private var fullTextInsertStatements: [Int32 : SqlitePreparedStatement] = [:]
     private var fullTextDeleteStatements: [Int32 : SqlitePreparedStatement] = [:]
@@ -347,7 +346,7 @@ public final class SqliteValueBox: ValueBox {
                         return nil
                     }
 
-                    for fileName in dabaseFileNames {
+                    for fileName in databaseFileNames {
                         let _ = try? FileManager.default.removeItem(atPath: basePath + "/\(fileName)")
                     }
                     database = Database(path, readOnly: false)!
@@ -367,7 +366,7 @@ public final class SqliteValueBox: ValueBox {
                 }
 
                 assert(false)
-                for fileName in dabaseFileNames {
+                for fileName in databaseFileNames {
                     let _ = try? FileManager.default.removeItem(atPath: basePath + "/\(fileName)")
                 }
 
@@ -400,7 +399,7 @@ public final class SqliteValueBox: ValueBox {
                 if self.isEncrypted(database) {
                     postboxLog("Reencryption failed")
 
-                    for fileName in dabaseFileNames {
+                    for fileName in databaseFileNames {
                         let _ = try? FileManager.default.removeItem(atPath: basePath + "/\(fileName)")
                     }
                     database = Database(path, readOnly: false)!
@@ -427,7 +426,7 @@ public final class SqliteValueBox: ValueBox {
                         return nil
                     }
 
-                    for fileName in dabaseFileNames {
+                    for fileName in databaseFileNames {
                         let _ = try? FileManager.default.removeItem(atPath: basePath + "/\(fileName)")
                     }
                     database = Database(path, readOnly: false)!
@@ -1224,7 +1223,7 @@ public final class SqliteValueBox: ValueBox {
                     preconditionFailure(errorText)
                 }
                 let preparedStatement = SqlitePreparedStatement(statement: statement)
-                self.insertOrReplacePrimaryKeyStatements[table.table.id] = preparedStatement
+                self.insertOrReplaceIndexKeyStatements[table.table.id] = preparedStatement
                 resultStatement = preparedStatement
             }
         }
@@ -1279,7 +1278,7 @@ public final class SqliteValueBox: ValueBox {
                     preconditionFailure(errorText)
                 }
                 let preparedStatement = SqlitePreparedStatement(statement: statement)
-                self.insertOrIgnorePrimaryKeyStatements[table.table.id] = preparedStatement
+                self.insertOrIgnoreIndexKeyStatements[table.table.id] = preparedStatement
                 resultStatement = preparedStatement
             }
         }
@@ -1330,38 +1329,6 @@ public final class SqliteValueBox: ValueBox {
         return resultStatement
     }
 
-    private func moveStatement(_ table: ValueBoxTable, from previousKey: ValueBoxKey, to updatedKey: ValueBoxKey) -> SqlitePreparedStatement {
-        precondition(self.queue.isCurrent())
-        checkTableKey(table, previousKey)
-        checkTableKey(table, updatedKey)
-        
-        let resultStatement: SqlitePreparedStatement
-        
-        if let statement = self.moveStatements[table.id] {
-            resultStatement = statement
-        } else {
-            var statement: OpaquePointer? = nil
-            let status = sqlite3_prepare_v3(self.database.handle, "UPDATE t\(table.id) SET key=? WHERE key=?", -1, SQLITE_PREPARE_PERSISTENT, &statement, nil)
-            precondition(status == SQLITE_OK)
-            let preparedStatement = SqlitePreparedStatement(statement: statement)
-            self.moveStatements[table.id] = preparedStatement
-            resultStatement = preparedStatement
-        }
-        
-        resultStatement.reset()
-        
-        switch table.keyType {
-            case .binary:
-                resultStatement.bind(1, data: previousKey.memory, length: previousKey.length)
-                resultStatement.bind(2, data: updatedKey.memory, length: updatedKey.length)
-            case .int64:
-                resultStatement.bind(1, number: previousKey.getInt64(0))
-                resultStatement.bind(2, number: updatedKey.getInt64(0))
-        }
-        
-        return resultStatement
-    }
-    
     private func copyStatement(fromTable: ValueBoxTable, fromKey: ValueBoxKey, toTable: ValueBoxTable, toKey: ValueBoxKey) -> SqlitePreparedStatement {
         precondition(self.queue.isCurrent())
         let _ = checkTable(fromTable)
@@ -1443,6 +1410,8 @@ public final class SqliteValueBox: ValueBox {
     }
 
     private func fullTextDeleteStatement(_ table: ValueBoxFullTextTable, itemId: Data) -> SqlitePreparedStatement {
+        precondition(self.queue.isCurrent())
+        
         let resultStatement: SqlitePreparedStatement
 
         if let statement = self.fullTextDeleteStatements[table.id] {
@@ -2004,16 +1973,6 @@ public final class SqliteValueBox: ValueBox {
         }
     }
 
-    public func move(_ table: ValueBoxTable, from previousKey: ValueBoxKey, to updatedKey: ValueBoxKey) {
-        precondition(self.queue.isCurrent())
-        if let _ = self.tables[table.id] {
-            let statement = self.moveStatement(table, from: previousKey, to: updatedKey)
-            while statement.step(handle: self.database.handle, pathToRemoveOnError: self.removeDatabaseOnError ? self.databasePath : nil) {
-            }
-            statement.reset()
-        }
-    }
-    
     public func copy(fromTable: ValueBoxTable, fromKey: ValueBoxKey, toTable: ValueBoxTable, toKey: ValueBoxKey) {
         precondition(self.queue.isCurrent())
         if let _ = self.tables[fromTable.id] {
@@ -2254,11 +2213,6 @@ public final class SqliteValueBox: ValueBox {
         }
         self.deleteStatements.removeAll()
 
-        for (_, statement) in self.moveStatements {
-            statement.destroy()
-        }
-        self.moveStatements.removeAll()
-        
         for (_, statement) in self.copyStatements {
             statement.destroy()
         }
@@ -2319,7 +2273,7 @@ public final class SqliteValueBox: ValueBox {
 
         postboxLog("dropping DB")
 
-        for fileName in dabaseFileNames {
+        for fileName in databaseFileNames {
             let _ = try? FileManager.default.removeItem(atPath: self.basePath + "/\(fileName)")
         }
 
@@ -2368,7 +2322,7 @@ public final class SqliteValueBox: ValueBox {
 
         self.exportEncrypted(database: database, to: targetPath, encryptionParameters: encryptionParameters)
 
-        for name in dabaseFileNames {
+        for name in databaseFileNames {
             let _ = try? FileManager.default.removeItem(atPath: self.basePath + "/\(name)")
             let _ = try? FileManager.default.moveItem(atPath: targetPath + "/\(name)", toPath: self.basePath + "/\(name)")
         }

submodules/Postbox/Sources/ValueBox.swift

@@ -85,7 +85,6 @@ public protocol ValueBox {
     func exists(_ table: ValueBoxTable, key: ValueBoxKey) -> Bool
     func set(_ table: ValueBoxTable, key: ValueBoxKey, value: MemoryBuffer)
     func remove(_ table: ValueBoxTable, key: ValueBoxKey, secure: Bool)
-    func move(_ table: ValueBoxTable, from previousKey: ValueBoxKey, to updatedKey: ValueBoxKey)
     func copy(fromTable: ValueBoxTable, fromKey: ValueBoxKey, toTable: ValueBoxTable, toKey: ValueBoxKey)
     func removeRange(_ table: ValueBoxTable, start: ValueBoxKey, end: ValueBoxKey)
     func fullTextSet(_ table: ValueBoxFullTextTable, collectionId: String, itemId: String, contents: String, tags: String)