Commit 74b093e0 authored by Sandro Knauß's avatar Sandro Knauß 🐝
Browse files

fix logic about expandable recipients.

parent f5774096
Pipeline #84181 passed with stage
in 16 minutes and 57 seconds
......@@ -525,7 +525,7 @@ void ComposerViewBase::slotEmailAddressResolved(KJob *job)
// working copy in case composers instantly emit result
const auto composers = m_composers;
for (MessageComposer::Composer *composer : composers) {
fillComposer(composer);
fillComposer(composer, UseExpandedRecipients);
connect(composer, &MessageComposer::Composer::result, this, &ComposerViewBase::slotSendComposeResult);
composer->start();
qCDebug(MESSAGECOMPOSER_LOG) << "Started a composer for sending!";
......@@ -1509,11 +1509,17 @@ void ComposerViewBase::addAttachmentPart(KMime::Content *partToAttach)
m_attachmentController->addAttachment(part);
}
void ComposerViewBase::fillComposer(MessageComposer::Composer *composer)
{
fillComposer(composer, UseUnExpandedRecipients);
}
void ComposerViewBase::fillComposer(MessageComposer::Composer *composer, ComposerViewBase::RecipientExpansion expansion)
{
fillGlobalPart(composer->globalPart());
m_editor->fillComposerTextPart(composer->textPart());
fillInfoPart(composer->infoPart(), UseUnExpandedRecipients);
fillInfoPart(composer->infoPart(), expansion);
if (m_attachmentModel) {
composer->addAttachmentParts(m_attachmentModel->attachments());
}
......
......@@ -285,6 +285,7 @@ private:
UseExpandedRecipients,
UseUnExpandedRecipients,
};
void fillComposer(MessageComposer::Composer *composer, ComposerViewBase::RecipientExpansion expansion);
Q_REQUIRED_RESULT QVector<MessageComposer::Composer *> generateCryptoMessages(bool &wasCanceled);
void fillGlobalPart(MessageComposer::GlobalPart *globalPart);
void fillInfoPart(MessageComposer::InfoPart *part, RecipientExpansion expansion);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment