ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 22:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Browse Source
This commit is contained in:
Ilya Laktyushin
2025-01-22 13:37:05 +04:00
parent c0bfe87449 46225ca99b
commit bf8c4f1ecd
107 changed files with 5958 additions and 1013 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
submodules/TelegramUI/Sources/SharedAccountContext.swift
View File

@@ -176,6 +176,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
private let callState = Promise<PresentationCallState?>(nil)
private var awaitingCallConnectionDisposable: Disposable?
private var callPeerDisposable: Disposable?
private var callIsConferenceDisposable: Disposable?
private var groupCallController: VoiceChatController?
public var currentGroupCallController: ViewController? {
@@ -811,18 +812,41 @@ public final class SharedAccountContextImpl: SharedAccountContext {
self.callController?.dismiss()
self.callController = nil
self.hasOngoingCall.set(false)
self.callState.set(.single(nil))
self.notificationController?.setBlocking(nil)
self.callPeerDisposable?.dispose()
self.callPeerDisposable = nil
self.callIsConferenceDisposable?.dispose()
self.callIsConferenceDisposable = nil
if let call {
self.callState.set(call.state
|> map(Optional.init))
if call.conferenceCall == nil {
self.callState.set(call.state
|> map(Optional.init))
}
self.hasOngoingCall.set(true)
setNotificationCall(call)
self.callIsConferenceDisposable = (call.hasConference
|> deliverOnMainQueue).startStrict(next: { [weak self] _ in
guard let self else {
return
}
guard let call = self.call else {
return
}
guard let callController = self.callController, callController.call === call else {
return
}
if call.conferenceCall != nil {
self.callState.set(.single(nil))
self.presentControllerWithCurrentCall()
}
})
if call.isOutgoing {
self.presentControllerWithCurrentCall()
} else {
@@ -921,7 +945,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
return
}
let groupCallController = makeVoiceChatController(sharedContext: strongSelf, accountContext: call.accountContext, call: call, initialData: initialData)
let groupCallController = makeVoiceChatController(sharedContext: strongSelf, accountContext: call.accountContext, call: call, initialData: initialData, sourceCallController: nil)
groupCallController.onViewDidAppear = { [weak strongSelf] in
if let strongSelf {
strongSelf.hasGroupCallOnScreenPromise.set(true)
@@ -947,31 +971,34 @@ public final class SharedAccountContextImpl: SharedAccountContext {
}
})
let callSignal: Signal<PresentationCall?, NoError> = .single(nil)
let callSignal: Signal<(PresentationCall?, PresentationGroupCall?), NoError> = .single((nil, nil))
|> then(
callManager.currentCallSignal
|> deliverOnMainQueue
|> mapToSignal { call -> Signal<PresentationCall?, NoError> in
|> mapToSignal { call -> Signal<(PresentationCall?, PresentationGroupCall?), NoError> in
guard let call else {
return .single(nil)
return .single((nil, nil))
}
return call.state
|> map { [weak call] state -> PresentationCall? in
return combineLatest(call.state, call.hasConference)
|> map { [weak call] state, _ -> (PresentationCall?, PresentationGroupCall?) in
guard let call else {
return nil
return (nil, nil)
}
if let conferenceCall = call.conferenceCall {
return (nil, conferenceCall)
}
switch state.state {
case .ringing:
return nil
return (nil, nil)
case .terminating, .terminated:
return nil
return (nil, nil)
default:
return call
return (call, nil)
}
}
}
|> distinctUntilChanged(isEqual: { lhs, rhs in
return lhs === rhs
return lhs.0 === rhs.0 && lhs.1 === rhs.1
})
)
let groupCallSignal: Signal<PresentationGroupCall?, NoError> = .single(nil)
@@ -985,8 +1012,15 @@ public final class SharedAccountContextImpl: SharedAccountContext {
self.hasGroupCallOnScreenPromise.get()
).start(next: { [weak self] call, groupCall, hasGroupCallOnScreen in
if let strongSelf = self {
var (call, conferenceCall) = call
var groupCall = groupCall
if let conferenceCall {
call = nil
groupCall = conferenceCall
}
let statusBarContent: CallStatusBarNodeImpl.Content?
if let call = call {
if let call, !hasGroupCallOnScreen {
statusBarContent = .call(strongSelf, call.context.account, call)
} else if let groupCall = groupCall, !hasGroupCallOnScreen {
statusBarContent = .groupCall(strongSelf, groupCall.account, groupCall)
@@ -1021,7 +1055,11 @@ public final class SharedAccountContextImpl: SharedAccountContext {
if callController.isNodeLoaded {
mainWindow.hostView.containerView.endEditing(true)
if callController.view.superview == nil {
mainWindow.present(callController, on: .calls)
if useFlatModalCallsPresentation(context: callController.call.context) {
(mainWindow.viewController as? NavigationController)?.pushViewController(callController)
} else {
mainWindow.present(callController, on: .calls)
}
} else {
callController.expandFromPipIfPossible()
}
@@ -1179,30 +1217,94 @@ public final class SharedAccountContextImpl: SharedAccountContext {
return
}
if let currentCallController = self.callController {
if currentCallController.call == .call(call) {
self.navigateToCurrentCall()
return
} else {
if let conferenceCall = call.conferenceCall {
if let groupCallController = self.groupCallController {
if groupCallController.call === conferenceCall {
return
}
groupCallController.dismiss(closing: true, manual: false)
self.groupCallController = nil
}
var transitioniongCallController: CallController?
if let callController = self.callController {
transitioniongCallController = callController
callController.dismissWithoutAnimation()
self.callController = nil
currentCallController.dismiss()
}
}
self.mainWindow?.hostView.containerView.endEditing(true)
let callController = CallController(sharedContext: self, account: call.context.account, call: .call(call), easyDebugAccess: !GlobalExperimentalSettings.isAppStoreBuild)
self.callController = callController
callController.restoreUIForPictureInPicture = { [weak self, weak callController] completion in
guard let self, let callController else {
completion(false)
return
let _ = (makeVoiceChatControllerInitialData(sharedContext: self, accountContext: conferenceCall.accountContext, call: conferenceCall)
|> deliverOnMainQueue).start(next: { [weak self, weak transitioniongCallController] initialData in
guard let self else {
return
}
guard let navigationController = self.mainWindow?.viewController as? NavigationController else {
return
}
guard let call = self.call, let conferenceCall = call.conferenceCall else {
return
}
let groupCallController = makeVoiceChatController(sharedContext: self, accountContext: conferenceCall.accountContext, call: conferenceCall, initialData: initialData, sourceCallController: transitioniongCallController)
groupCallController.onViewDidAppear = { [weak self] in
if let self {
self.hasGroupCallOnScreenPromise.set(true)
}
}
groupCallController.onViewDidDisappear = { [weak self] in
if let self {
self.hasGroupCallOnScreenPromise.set(false)
}
}
groupCallController.navigationPresentation = .flatModal
groupCallController.parentNavigationController = navigationController
self.groupCallController = groupCallController
navigationController.pushViewController(groupCallController)
})
} else {
if let currentCallController = self.callController {
if currentCallController.call === call {
self.navigateToCurrentCall()
return
} else {
self.callController = nil
currentCallController.dismiss()
}
}
if callController.window == nil {
self.mainWindow?.hostView.containerView.endEditing(true)
let callController = CallController(sharedContext: self, account: call.context.account, call: call, easyDebugAccess: !GlobalExperimentalSettings.isAppStoreBuild)
self.callController = callController
callController.restoreUIForPictureInPicture = { [weak self, weak callController] completion in
guard let self, let callController else {
completion(false)
return
}
if callController.window == nil {
if useFlatModalCallsPresentation(context: callController.call.context) {
(self.mainWindow?.viewController as? NavigationController)?.pushViewController(callController)
} else {
self.mainWindow?.present(callController, on: .calls)
}
}
completion(true)
}
callController.onViewDidAppear = { [weak self] in
if let self {
self.hasGroupCallOnScreenPromise.set(true)
}
}
callController.onViewDidDisappear = { [weak self] in
if let self {
self.hasGroupCallOnScreenPromise.set(false)
}
}
if useFlatModalCallsPresentation(context: callController.call.context) {
self.hasGroupCallOnScreenPromise.set(true)
(self.mainWindow?.viewController as? NavigationController)?.pushViewController(callController)
} else {
self.mainWindow?.present(callController, on: .calls)
}
completion(true)
}
self.mainWindow?.present(callController, on: .calls)
}
public func updateNotificationTokensRegistration() {
@@ -1434,7 +1536,12 @@ public final class SharedAccountContextImpl: SharedAccountContext {
if let callController = self.callController {
if callController.isNodeLoaded && callController.view.superview == nil {
mainWindow.hostView.containerView.endEditing(true)
mainWindow.present(callController, on: .calls)
if useFlatModalCallsPresentation(context: callController.call.context) {
(mainWindow.viewController as? NavigationController)?.pushViewController(callController)
} else {
mainWindow.present(callController, on: .calls)
}
}
} else if let groupCallController = self.groupCallController {
if groupCallController.isNodeLoaded && groupCallController.view.superview == nil {
@@ -3135,3 +3242,10 @@ private func peerInfoControllerImpl(context: AccountContext, updatedPresentation
}
return nil
}
private func useFlatModalCallsPresentation(context: AccountContext) -> Bool {
if let data = context.currentAppConfiguration.with({ $0 }).data, data["ios_killswitch_modalcalls"] != nil {
return false
}
return true
}