Skip to content

[stable22] fix: Crashes on navigation controller when presenting chats #2343

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

Merged
SystemKeeper merged 1 commit into from
Jan 9, 2026
Merged

[stable22] fix: Crashes on navigation controller when presenting chats #2343

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
17 changes: 10 additions & 7 deletions NextcloudTalk/User Interface/NCUserInterfaceController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,9 @@ - (void)presentAlertWithTitle:(NSString *)title withMessage:(NSString *)message

- (void)presentConversationsList
{
[_mainViewController dismissViewControllerAnimated:YES completion:nil];

[_mainViewController popSecondaryColumnToRootViewController];
[_mainViewController showColumn:UISplitViewControllerColumnPrimary];
[_mainViewController dismissViewControllerAnimated:YES completion:^{
[self popToConversationsList];
}];
}

- (void)popToConversationsList
Expand All @@ -347,9 +346,13 @@ - (void)popToConversationsList

- (void)presentChatViewController:(ChatViewController *)chatViewController
{
[self presentConversationsList];
[_mainViewController showDetailViewController:chatViewController sender:self];
[_roomsTableViewController setSelectedRoomToken:chatViewController.room.token];
// Present conversation list first (see presentConversationsList)
[_mainViewController dismissViewControllerAnimated:YES completion:^{
[self popToConversationsList];

[self->_mainViewController showDetailViewController:chatViewController sender:self];
[self->_roomsTableViewController setSelectedRoomToken:chatViewController.room.token];
}];
}

- (void)presentCallViewController:(CallViewController *)callViewController withCompletionBlock:(PresentCallControllerCompletionBlock)block
Expand Down