Stowage/tutanota
2
0
Fork 0
mirror of https://github.com/tutao/tutanota.git synced 2025-10-19 07:53:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix failed AssertNotNull when reply shortcut is triggered to quickly

Browse source 
Caused by the shortcut being enabled when the `MailViewerViewModel` is
`null`, which happens because `!viewModel()?.isDraftMail()` is true when
the mail is not draft but also when the viewModel is null.

The same is true for the replyAll and forward shortcuts.

Close #9736
This commit is contained in:
hrb-hub 2025-09-29 17:59:36 +02:00 • committed by wrd
parent b8ee0971d4
commit c61dff79e8
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/mail-app/mail/view/ConversationViewer.ts
View file

@ -49,6 +49,11 @@ export class ConversationViewer implements Component<ConversationViewerAttrs> {
private setupShortcuts(viewModel: () => MailViewerViewModel | undefined): Array<Shortcut> {
const userController = locator.logins.getUserController()
const isReplyAndForwardEnabled = () => {
const mailViewerViewModel = viewModel()
return mailViewerViewModel != null && !mailViewerViewModel.isDraftMail()
}
const shortcuts: Shortcut[] = [
{
key: Keys.PAGE_UP,
@ -75,7 +80,7 @@ export class ConversationViewer implements Component<ConversationViewerAttrs> {
exec: () => {
assertNotNull(viewModel()).reply(false)
},
enabled: () => !viewModel()?.isDraftMail(),
enabled: isReplyAndForwardEnabled,
help: "reply_action",
},
{
@ -84,7 +89,7 @@ export class ConversationViewer implements Component<ConversationViewerAttrs> {
exec: () => {
assertNotNull(viewModel()).reply(true)
},
enabled: () => !viewModel()?.isDraftMail(),
enabled: isReplyAndForwardEnabled,
help: "replyAll_action",
},
]
@ -92,7 +97,7 @@ export class ConversationViewer implements Component<ConversationViewerAttrs> {
shortcuts.push({
key: Keys.F,
shift: true,
enabled: () => !viewModel()?.isDraftMail(),
enabled: isReplyAndForwardEnabled,
exec: () => {
assertNotNull(viewModel()).forward().catch(ofClass(UserError, showUserError))
},