Skip to content

fix(outbox): reset status and failure flag on message update #11121

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(outbox): reset status and failure flag on message update #11121

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions lib/Controller/OutboxController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,10 @@ public function update(
$message->setSmimeEncrypt($smimeEncrypt);
$message->setRequestMdn($requestMdn);

// Updating the message should reset its status. Else it's impossible to
// retry an erroneous one.
$message->setStatus(LocalMessage::STATUS_RAW);

if (!empty($smimeCertificateId)) {
$smimeCertificate = $this->smimeService->findCertificate($smimeCertificateId, $this->userId);
$message->setSmimeCertificateId($smimeCertificate->getId());
Expand Down
3 changes: 3 additions & 0 deletions lib/Service/OutboxService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@ public function updateMessage(Account $account, LocalMessage $message, array $to
$ccRecipients = self::convertToRecipient($cc, Recipient::TYPE_CC);
$bccRecipients = self::convertToRecipient($bcc, Recipient::TYPE_BCC);

// The message is changed, so any previous error should be ignored
$message->setFailed(false);

$message = $this->mapper->updateWithRecipients($message, $toRecipients, $ccRecipients, $bccRecipients);

if ($attachments === []) {
Expand Down