From 3046f0d3397eecdc99cb280380f76362f313ecaf Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Fri, 14 Jun 2024 14:44:20 +0200 Subject: [PATCH] fix: Treat user as nullable --- Mail/Views/Alerts/LogoutConfirmationView.swift | 2 +- Mail/Views/Bottom sheets/Actions/ActionsView.swift | 2 +- MailCore/Models/Contact/CommonContact.swift | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Mail/Views/Alerts/LogoutConfirmationView.swift b/Mail/Views/Alerts/LogoutConfirmationView.swift index 1ff5327c2..801acbe3d 100644 --- a/Mail/Views/Alerts/LogoutConfirmationView.swift +++ b/Mail/Views/Alerts/LogoutConfirmationView.swift @@ -37,7 +37,7 @@ struct LogoutConfirmationView: View { Text(MailResourcesStrings.Localizable.confirmLogoutTitle) .textStyle(.bodyMedium) .padding(.bottom, UIPadding.alertTitleBottom) - Text(MailResourcesStrings.Localizable.confirmLogoutDescription(account.user.email)) + Text(MailResourcesStrings.Localizable.confirmLogoutDescription(account.user?.email ?? "")) .textStyle(.bodySecondary) .padding(.bottom, UIPadding.alertDescriptionBottom) ModalButtonsView(primaryButtonTitle: MailResourcesStrings.Localizable.buttonConfirm, primaryButtonAction: logout) diff --git a/Mail/Views/Bottom sheets/Actions/ActionsView.swift b/Mail/Views/Bottom sheets/Actions/ActionsView.swift index 87f570eda..3ee83e176 100644 --- a/Mail/Views/Bottom sheets/Actions/ActionsView.swift +++ b/Mail/Views/Bottom sheets/Actions/ActionsView.swift @@ -34,7 +34,7 @@ struct ActionsView: View { target messages: [Message], origin: ActionOrigin, completionHandler: ((Action) -> Void)? = nil) { - let userIsStaff = mailboxManager.account.user.isStaff ?? false + let userIsStaff = mailboxManager.account.user?.isStaff ?? false let actions = Action.actionsForMessages(messages, origin: origin, userIsStaff: userIsStaff) quickActions = actions.quickActions listActions = actions.listActions diff --git a/MailCore/Models/Contact/CommonContact.swift b/MailCore/Models/Contact/CommonContact.swift index d88541e27..cdaa84650 100644 --- a/MailCore/Models/Contact/CommonContact.swift +++ b/MailCore/Models/Contact/CommonContact.swift @@ -64,8 +64,9 @@ public final class CommonContact: Identifiable { if correspondent.isMe(currentMailboxEmail: contextMailboxManager.mailbox.email) { fullName = MailResourcesStrings.Localizable.contactMe color = UIColor.backgroundColor(from: email.hash, with: UIConstants.avatarColors) - if correspondent.isCurrentUser(currentAccountEmail: contextMailboxManager.account.user.email), - let avatarString = contextMailboxManager.account.user.avatar, + if let currentUser = contextMailboxManager.account.user, + correspondent.isCurrentUser(currentAccountEmail: currentUser.email), + let avatarString = currentUser.avatar, let avatarURL = URL(string: avatarString) { avatarImageRequest = AvatarImageRequest(imageRequest: ImageRequest(url: avatarURL), shouldAuthenticate: false) } else {