mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-08-08 08:31:13 +00:00
Fix return to stream
This commit is contained in:
parent
fd46692b95
commit
8dd98a01f9
@ -971,6 +971,11 @@ public final class SharedAccountContextImpl: SharedAccountContext {
|
|||||||
if groupCallController.view.superview == nil {
|
if groupCallController.view.superview == nil {
|
||||||
(mainWindow.viewController as? NavigationController)?.pushViewController(groupCallController)
|
(mainWindow.viewController as? NavigationController)?.pushViewController(groupCallController)
|
||||||
}
|
}
|
||||||
|
} else if let streamController = self.streamController {
|
||||||
|
mainWindow.hostView.containerView.endEditing(true)
|
||||||
|
if streamController.view.superview == nil {
|
||||||
|
(mainWindow.viewController as? NavigationController)?.pushViewController(streamController)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -1357,8 +1362,23 @@ public final class SharedAccountContextImpl: SharedAccountContext {
|
|||||||
let streamController = MediaStreamComponentController(call: group)
|
let streamController = MediaStreamComponentController(call: group)
|
||||||
streamController.navigationPresentation = .flatModal
|
streamController.navigationPresentation = .flatModal
|
||||||
streamController.parentNavigationController = navigationController
|
streamController.parentNavigationController = navigationController
|
||||||
|
|
||||||
|
let thisCallIsOnScreenPromise = ValuePromise<Bool>(false, ignoreRepeated: true)
|
||||||
|
streamController.onViewDidAppear = {
|
||||||
|
thisCallIsOnScreenPromise.set(true)
|
||||||
|
}
|
||||||
|
streamController.onViewDidDisappear = {
|
||||||
|
thisCallIsOnScreenPromise.set(false)
|
||||||
|
}
|
||||||
|
|
||||||
self.streamController = streamController
|
self.streamController = streamController
|
||||||
|
|
||||||
|
self.mainWindow?.hostView.containerView.endEditing(true)
|
||||||
|
|
||||||
|
thisCallIsOnScreenPromise.set(true)
|
||||||
|
self.hasGroupCallOnScreenPromise.set(thisCallIsOnScreenPromise.get())
|
||||||
|
beginDisplayingCallStatusBar.set(.single(Void()))
|
||||||
|
|
||||||
navigationController.pushViewController(streamController)
|
navigationController.pushViewController(streamController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1786,6 +1806,11 @@ public final class SharedAccountContextImpl: SharedAccountContext {
|
|||||||
mainWindow.hostView.containerView.endEditing(true)
|
mainWindow.hostView.containerView.endEditing(true)
|
||||||
(mainWindow.viewController as? NavigationController)?.pushViewController(groupCallController)
|
(mainWindow.viewController as? NavigationController)?.pushViewController(groupCallController)
|
||||||
}
|
}
|
||||||
|
} else if let streamController = self.streamController {
|
||||||
|
if streamController.isNodeLoaded && streamController.view.superview == nil {
|
||||||
|
mainWindow.hostView.containerView.endEditing(true)
|
||||||
|
(mainWindow.viewController as? NavigationController)?.pushViewController(streamController)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user