From 1aebcb6c0be8c13e80d737ee07b6c7d605d0534c Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Wed, 26 Jun 2019 01:10:47 +0200 Subject: [PATCH] Fix build --- submodules/TelegramUI/TelegramUI/ChatController.swift | 2 +- submodules/TelegramUI/TelegramUI/ChatListController.swift | 2 +- submodules/TelegramUI/TelegramUI/NavigateToChatController.swift | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift index 23b44c10fb..c5e4287a6a 100644 --- a/submodules/TelegramUI/TelegramUI/ChatController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatController.swift @@ -231,7 +231,7 @@ public final class ChatController: TelegramController, GalleryHiddenMediaTarget, private var beginMediaRecordingRequestId: Int = 0 private var lockMediaRecordingRequestId: Int? - + public override var navigationCustomData: Any? { return self.chatLocation } diff --git a/submodules/TelegramUI/TelegramUI/ChatListController.swift b/submodules/TelegramUI/TelegramUI/ChatListController.swift index a12ba47557..187501c370 100644 --- a/submodules/TelegramUI/TelegramUI/ChatListController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatListController.swift @@ -692,7 +692,7 @@ public class ChatListController: TelegramController, UIViewControllerPreviewingD scrollToEndIfExists = true } - navigateToChatController(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peerId), scrollToEndIfExists: scrollToEndIfExists, options: strongSelf.groupId == PeerGroupId.root ? [.removeOnMasterDetails] : [], parentGroupId: strongSelf.groupId, completion: { [weak self] in + navigateToChatController(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peerId), scrollToEndIfExists: scrollToEndIfExists, options: strongSelf.groupId == PeerGroupId.root ? [.removeOnMasterDetails] : [], parentGroupId: strongSelf.groupId, completion: { [weak self] in self?.chatListDisplayNode.chatListNode.clearHighlightAnimated(true) }) } diff --git a/submodules/TelegramUI/TelegramUI/NavigateToChatController.swift b/submodules/TelegramUI/TelegramUI/NavigateToChatController.swift index 8480dff453..42883c4ec2 100644 --- a/submodules/TelegramUI/TelegramUI/NavigateToChatController.swift +++ b/submodules/TelegramUI/TelegramUI/NavigateToChatController.swift @@ -11,7 +11,6 @@ public enum NavigateToChatKeepStack { } public func navigateToChatController(navigationController: NavigationController, chatController: ChatController? = nil, context: AccountContext, chatLocation: ChatLocation, messageId: MessageId? = nil, botStart: ChatControllerInitialBotStart? = nil, updateTextInputState: ChatTextInputState? = nil, activateInput: Bool = false, keepStack: NavigateToChatKeepStack = .default, purposefulAction: (() -> Void)? = nil, scrollToEndIfExists: Bool = false, animated: Bool = true, options: NavigationAnimationOptions = [], parentGroupId: PeerGroupId? = nil, completion: @escaping () -> Void = {}) { - var found = false var isFirst = true for controller in navigationController.viewControllers.reversed() {