Skip to content

fix: Fix rare NullPointerException + log it to sentry #2657

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
merged 2 commits into from
Oct 10, 2025
Merged

fix: Fix rare NullPointerException + log it to sentry #2657

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3eddc31
fix: Fix rare NullPointerException + log it to sentry
LouisCAD Oct 9, 2025
fbae28b
refactor: Apply suggestions from code review
KevinBoulongne Oct 10, 2025
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
13 changes: 10 additions & 3 deletions app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,15 +356,22 @@ class NewMessageViewModel @Inject constructor(
}

private suspend fun setReplyForwardDraftValues(draft: Draft, fullMessage: Message) {

with(draftInitManager) {
draft.setPreviousMessage(draftMode = draftMode, previousMessage = fullMessage)
}

val quote = draftInitManager.createQuote(draftMode, fullMessage, draft.attachments)
if (quote != null) initialQuote = quote

if (fullMessage.body == null) {
SentryLog.e(TAG, "The message we're trying to reply to has an unexpected null body") { scope ->
scope.setExtra("Message resource", fullMessage.resource)
}
}

val isAiEnabled = currentMailbox().featureFlags.contains(FeatureFlag.AI)
if (isAiEnabled) parsePreviousMailToAnswerWithAi(fullMessage.body!!)
if (isAiEnabled) parsePreviousMailToAnswerWithAi(fullMessage.body)

val isEncryptionEnabled = currentMailbox().featureFlags.contains(FeatureFlag.ENCRYPTION)
if (isEncryptionEnabled) draft.isEncrypted = fullMessage.isEncrypted
Expand Down Expand Up @@ -567,9 +574,9 @@ class NewMessageViewModel @Inject constructor(
}
}

private suspend fun parsePreviousMailToAnswerWithAi(previousMessageBody: Body) {
private suspend fun parsePreviousMailToAnswerWithAi(previousMessageBody: Body?) {
if (draftMode == DraftMode.REPLY || draftMode == DraftMode.REPLY_ALL) {
aiSharedData.previousMessageBodyPlainText = previousMessageBody.asPlainText()
aiSharedData.previousMessageBodyPlainText = previousMessageBody?.asPlainText()
}
}

Expand Down