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

WIP

Browse Source
This commit is contained in:
Ali
2020-11-26 02:54:49 +04:00
parent e2bc141356
commit a97cd76c5d
20 changed files with 776 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -655,23 +655,26 @@ public final class SharedAccountContextImpl: SharedAccountContext {
}
})
self.callStateDisposable = (self.callState.get()
|> deliverOnMainQueue).start(next: { [weak self] state in
self.callStateDisposable = combineLatest(queue: .mainQueue(),
self.callState.get(),
callManager.currentGroupCallSignal
|> map { call -> Bool in
return call != nil
}
).start(next: { [weak self] state, hasGroupCall in
if let strongSelf = self {
let resolvedText: CallStatusText
if let state = state {
// if [.active, .paused].contains(state.videoState) || [.active, .paused].contains(state.remoteVideoState) {
// resolvedText = .none
// } else {
switch state.state {
case .connecting, .requesting, .terminating, .ringing, .waiting:
resolvedText = .inProgress(nil)
case .terminated:
resolvedText = .none
case .active(let timestamp, _, _), .reconnecting(let timestamp, _, _):
resolvedText = .inProgress(timestamp)
}
// }
switch state.state {
case .connecting, .requesting, .terminating, .ringing, .waiting:
resolvedText = .inProgress(nil)
case .terminated:
resolvedText = .none
case .active(let timestamp, _, _), .reconnecting(let timestamp, _, _):
resolvedText = .inProgress(timestamp)
}
} else if hasGroupCall {
resolvedText = .inProgress(nil)
} else {
resolvedText = .none
}
@@ -705,7 +708,10 @@ public final class SharedAccountContextImpl: SharedAccountContext {
})
mainWindow.inCallNavigate = { [weak self] in
if let strongSelf = self, let callController = strongSelf.callController {
guard let strongSelf = self else {
return
}
if let callController = strongSelf.callController {
if callController.isNodeLoaded {
mainWindow.hostView.containerView.endEditing(true)
if callController.view.superview == nil {
@@ -714,6 +720,13 @@ public final class SharedAccountContextImpl: SharedAccountContext {
callController.expandFromPipIfPossible()
}
}
} else if let groupCallController = strongSelf.groupCallController {
if groupCallController.isNodeLoaded {
mainWindow.hostView.containerView.endEditing(true)
if groupCallController.view.superview == nil {
mainWindow.present(groupCallController, on: .calls)
}
}
}
}
} else {