Skip to content

Prevent duplicate Peer Info screens on rapid chat-title taps #2200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bojanstef wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −5
Open

Prevent duplicate Peer Info screens on rapid chat-title taps #2200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions submodules/TelegramUI/Sources/Chat/ChatControllerNavigationButtonAction.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ extension ChatControllerImpl {
if peer.restrictionText(platform: "ios", contentSettings: self.context.currentContentSettings.with { $0 }) == nil && !self.presentationInterfaceState.isNotAccessible {
if peer.id == self.context.account.peerId {
if let peer = self.presentationInterfaceState.renderedPeer?.chatMainPeer, let infoController = self.context.sharedContext.makePeerInfoController(context: self.context, updatedPresentationData: self.updatedPresentationData, peer: EnginePeer(peer), mode: .generic, avatarInitiallyExpanded: false, fromChat: true, requestsContext: nil) {
self.effectiveNavigationController?.pushViewController(infoController)
self.pushPeerInfoControllerAvoidingDuplicate(infoController)
}
} else {
var expandAvatar = expandAvatar
Expand All @@ -457,7 +457,7 @@ extension ChatControllerImpl {
mode = .generic
}
if let infoController = self.context.sharedContext.makePeerInfoController(context: self.context, updatedPresentationData: self.updatedPresentationData, peer: EnginePeer(peer), mode: mode, avatarInitiallyExpanded: expandAvatar, fromChat: true, requestsContext: self.contentData?.inviteRequestsContext) {
self.effectiveNavigationController?.pushViewController(infoController)
self.pushPeerInfoControllerAvoidingDuplicate(infoController)
}
}

Expand All @@ -467,7 +467,7 @@ extension ChatControllerImpl {
case .replyThread:
if let peer = self.presentationInterfaceState.renderedPeer?.peer, case let .replyThread(replyThreadMessage) = self.chatLocation, replyThreadMessage.peerId == self.context.account.peerId {
if let infoController = self.context.sharedContext.makePeerInfoController(context: self.context, updatedPresentationData: self.updatedPresentationData, peer: EnginePeer(peer), mode: .forumTopic(thread: replyThreadMessage), avatarInitiallyExpanded: false, fromChat: true, requestsContext: nil) {
self.effectiveNavigationController?.pushViewController(infoController)
self.pushPeerInfoControllerAvoidingDuplicate(infoController)
}
} else if let monoforumPeer = self.presentationInterfaceState.renderedPeer?.peer, case let .replyThread(replyThreadMessage) = self.chatLocation, monoforumPeer.isMonoForum {
let context = self.context
Expand All @@ -482,13 +482,13 @@ extension ChatControllerImpl {
return
}
if let infoController = self.context.sharedContext.makePeerInfoController(context: self.context, updatedPresentationData: self.updatedPresentationData, peer: peer, mode: .monoforum(monoforumPeer.id), avatarInitiallyExpanded: false, fromChat: true, requestsContext: nil) {
self.effectiveNavigationController?.pushViewController(infoController)
self.pushPeerInfoControllerAvoidingDuplicate(infoController)
}
}
}
} else if let channel = self.presentationInterfaceState.renderedPeer?.peer as? TelegramChannel, channel.isForumOrMonoForum, case let .replyThread(message) = self.chatLocation {
if let infoController = self.context.sharedContext.makePeerInfoController(context: self.context, updatedPresentationData: self.updatedPresentationData, peer: EnginePeer(channel), mode: .forumTopic(thread: message), avatarInitiallyExpanded: false, fromChat: true, requestsContext: self.contentData?.inviteRequestsContext) {
self.effectiveNavigationController?.pushViewController(infoController)
self.pushPeerInfoControllerAvoidingDuplicate(infoController)
}
}
case .customChatContents:
Expand Down Expand Up @@ -716,4 +716,20 @@ extension ChatControllerImpl {
self.editChat()
}
}

// #2185: rapid title-bar taps each pushed a new PeerInfoScreen, so a fast burst
// opened several stacked Info screens. Route every Info push through this guard:
// if this peer's Info is already on top of the navigation stack, treat the extra
// tap as a no-op instead of pushing a duplicate.
Comment on lines +720 to +723

@bojanstef bojanstef Jun 15, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LMK if you think I should remove the comments. @laktyushin

  • remove comments please
  • leave them

private func pushPeerInfoControllerAvoidingDuplicate(_ infoController: ViewController) {
guard let navigationController = self.effectiveNavigationController else {
return
}
if let topController = navigationController.viewControllers.last as? PeerInfoScreenImpl,
let newController = infoController as? PeerInfoScreenImpl,
topController.peerId == newController.peerId {
return
}
navigationController.pushViewController(infoController)
}
}