Merge branch 'fix/INBIOS-143-application-is-crashing-when-open-notification-while-report-a-problem-screen-is-opened' into 'release/4.17.0'

jacekkra · jacekkra · commit 8abf7656d52c · 2024-09-06T09:38:54.000Z
INBIOS-143 Fix nil unwrapping of IBOutlet

See merge request ProtonMail/protonmail-ios!4317
diff --git a/ProtonMail/ProtonMail/ViewControllers/APP/Mailbox/MailboxViewController/MailboxCoordinator.swift b/ProtonMail/ProtonMail/ViewControllers/APP/Mailbox/MailboxViewController/MailboxCoordinator.swift
@@ -569,6 +569,8 @@ extension MailboxCoordinator {
     }
 
     private func presentPageViewsFor(message: MessageEntity) {
+        viewController?.loadViewIfNeeded()
+
         let pageVM = MessagePagesViewModel(
             initialID: message.messageID,
             isUnread: viewController?.isShowingUnreadMessageOnly ?? false,
@@ -579,6 +581,7 @@ extension MailboxCoordinator {
                 self?.editScheduleMsg(messageID: msgID, originalScheduledTime: originalScheduledTime)
             }
         )
+
         presentPageViews(pageVM: pageVM)
     }
 
diff --git a/ProtonMail/ProtonMail/ViewControllers/APP/Mailbox/MailboxViewController/MailboxViewController.swift b/ProtonMail/ProtonMail/ViewControllers/APP/Mailbox/MailboxViewController/MailboxViewController.swift
@@ -139,7 +139,7 @@ class MailboxViewController: AttachmentPreviewViewController, ComposeSaveHintPro
     }
     private var shouldKeepSkeletonUntilManualDismissal = false
     var isShowingUnreadMessageOnly: Bool {
-        return self.unreadFilterButton.isSelected
+        unreadFilterButton?.isSelected ?? false
     }
 
     private let messageCellPresenter = NewMailboxMessageCellPresenter()

Original file line number	Diff line number	Diff line change
`@@ -569,6 +569,8 @@ extension MailboxCoordinator {`
`569`	`569`	`}`
`570`	`570`
`571`	`571`	`private func presentPageViewsFor(message: MessageEntity) {`
	`572`	`+ viewController?.loadViewIfNeeded()`
	`573`	`+`
`572`	`574`	`let pageVM = MessagePagesViewModel(`
`573`	`575`	`initialID: message.messageID,`
`574`	`576`	`isUnread: viewController?.isShowingUnreadMessageOnly ?? false,`
`@@ -579,6 +581,7 @@ extension MailboxCoordinator {`
`579`	`581`	`self?.editScheduleMsg(messageID: msgID, originalScheduledTime: originalScheduledTime)`
`580`	`582`	`}`
`581`	`583`	`)`
	`584`	`+`
`582`	`585`	`presentPageViews(pageVM: pageVM)`
`583`	`586`	`}`
`584`	`587`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ class MailboxViewController: AttachmentPreviewViewController, ComposeSaveHintPro`
`139`	`139`	`}`
`140`	`140`	`private var shouldKeepSkeletonUntilManualDismissal = false`
`141`	`141`	`var isShowingUnreadMessageOnly: Bool {`
`142`		`- return self.unreadFilterButton.isSelected`
	`142`	`+ unreadFilterButton?.isSelected ?? false`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`private let messageCellPresenter = NewMailboxMessageCellPresenter()`