Skip to content

Properly wait for dismissal before presenting a new view controller #5977

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

Closed
ChronicLynx wants to merge 1 commit into from
Closed

Properly wait for dismissal before presenting a new view controller #5977

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
7 changes: 5 additions & 2 deletions SignalUI/AttachmentApproval/AttachmentPrepViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,15 @@ public class AttachmentPrepViewController: OWSViewController {
private func presentFullScreen(viewController: UIViewController) {
if let presentedViewController = presentedViewController {
owsAssertDebug(false, "Already has presented view controller. [\(presentedViewController)]")
presentedViewController.dismiss(animated: false)
presentedViewController.dismiss(animated: false) { [weak self] in
self?.presentFullScreen(viewController: viewController)
}
return
}

viewController.modalPresentationStyle = .fullScreen
zoomOut(animated: true) { [weak self] in
self?.presentFullScreen(viewController, animated: false)
self?.present(viewController, animated: false, completion: nil)
Comment on lines 228 to +230
Copy link
Contributor

@sashaweiss-signal sashaweiss-signal Feb 25, 2025

Choose a reason for hiding this comment

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

Especially since this isn't related to the fix, I'm more inclined to drop the viewController.modalPresentationStyle = .fullScreen here, and continue to call self.presentFullScreen here.

}
}

Expand Down