mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-23 22:55:00 +00:00
Merge branch 'experimental-3'
# Conflicts: # Telegram/Telegram-iOS/en.lproj/Localizable.strings # submodules/ChatListUI/Sources/ChatListControllerNode.swift # submodules/ChatListUI/Sources/Node/ChatListNode.swift # submodules/ChatListUI/Sources/Node/ChatListStorageInfoItem.swift # submodules/GalleryUI/Sources/SecretMediaPreviewController.swift # submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewController.swift # submodules/LegacyComponents/Sources/TGMediaPickerGalleryInterfaceView.m # submodules/LegacyMediaPickerUI/Sources/LegacyICloudFilePicker.swift # submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift # submodules/TelegramApi/Sources/Api0.swift # submodules/TelegramApi/Sources/Api21.swift # submodules/TelegramApi/Sources/Api31.swift # submodules/TelegramCore/Sources/State/AccountStateManagementUtils.swift # submodules/TelegramCore/Sources/State/Serialization.swift # submodules/TelegramCore/Sources/TelegramEngine/Messages/AttachMenuBots.swift # submodules/TelegramUI/BUILD # submodules/TelegramUI/Components/LegacyMessageInputPanel/Sources/LegacyMessageInputPanel.swift # submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift # submodules/TelegramUI/Components/MessageInputPanelComponent/BUILD # submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/MessageInputPanelComponent.swift # submodules/TelegramUI/Components/Settings/NewSessionInfoScreen/Sources/NewSessionInfoContentComponent.swift # submodules/TelegramUI/Components/Settings/NewSessionInfoScreen/Sources/NewSessionInfoScreen.swift # submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift # submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift # submodules/TelegramUI/Sources/AccountContext.swift # submodules/TelegramUI/Sources/ChatController.swift # submodules/TelegramUI/Sources/OpenResolvedUrl.swift # submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift # submodules/TelegramUI/Sources/SharedAccountContext.swift # submodules/WebUI/Sources/WebAppTermsAlertController.swift # versions.json
This commit is contained in:
@@ -280,6 +280,11 @@ public final class SecretMediaPreviewController: ViewController {
|
||||
self.controllerNode.dismiss = { [weak self] in
|
||||
self?._hiddenMedia.set(.single(nil))
|
||||
self?.presentingViewController?.dismiss(animated: false, completion: nil)
|
||||
|
||||
if let tooltipController = self?.tooltipController {
|
||||
self?.tooltipController = nil
|
||||
tooltipController.dismiss()
|
||||
}
|
||||
}
|
||||
|
||||
self.controllerNode.beginCustomDismiss = { [weak self] _ in
|
||||
|
||||
Reference in New Issue
Block a user