diff options
Diffstat (limited to 'framework/src/domain/mime/mailtemplates.cpp')
-rw-r--r-- | framework/src/domain/mime/mailtemplates.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/framework/src/domain/mime/mailtemplates.cpp b/framework/src/domain/mime/mailtemplates.cpp index 30f9a48d..399b6aa1 100644 --- a/framework/src/domain/mime/mailtemplates.cpp +++ b/framework/src/domain/mime/mailtemplates.cpp | |||
@@ -1025,7 +1025,11 @@ static KMime::Types::Mailbox::List stringListToMailboxes(const QStringList &list | |||
1025 | return mailboxes; | 1025 | return mailboxes; |
1026 | } | 1026 | } |
1027 | 1027 | ||
1028 | KMime::Message::Ptr MailTemplates::createMessage(KMime::Message::Ptr existingMessage, const QStringList &to, const QStringList &cc, const QStringList &bcc, const KMime::Types::Mailbox &from, const QString &subject, const QString &body, bool htmlBody, const QList<Attachment> &attachments, const std::vector<GpgME::Key> &signingKeys, const std::vector<GpgME::Key> &encryptionKeys) | 1028 | KMime::Message::Ptr MailTemplates::createMessage(KMime::Message::Ptr existingMessage, |
1029 | const QStringList &to, const QStringList &cc, const QStringList &bcc, | ||
1030 | const KMime::Types::Mailbox &from, const QString &subject, const QString &body, bool htmlBody, | ||
1031 | const QList<Attachment> &attachments, const std::vector<GpgME::Key> &signingKeys, | ||
1032 | const std::vector<GpgME::Key> &encryptionKeys, const GpgME::Key &attachedKey) | ||
1029 | { | 1033 | { |
1030 | auto mail = existingMessage; | 1034 | auto mail = existingMessage; |
1031 | if (!mail) { | 1035 | if (!mail) { |
@@ -1089,7 +1093,8 @@ KMime::Message::Ptr MailTemplates::createMessage(KMime::Message::Ptr existingMes | |||
1089 | 1093 | ||
1090 | QByteArray bodyData; | 1094 | QByteArray bodyData; |
1091 | if (!signingKeys.empty() || !encryptionKeys.empty()) { | 1095 | if (!signingKeys.empty() || !encryptionKeys.empty()) { |
1092 | auto result = MailCrypto::processCrypto(bodyPart.get(), signingKeys, encryptionKeys, MailCrypto::OPENPGP); | 1096 | auto result = MailCrypto::processCrypto( |
1097 | bodyPart.get(), signingKeys, encryptionKeys, attachedKey, MailCrypto::OPENPGP); | ||
1093 | if (!result) { | 1098 | if (!result) { |
1094 | qWarning() << "Signing failed"; | 1099 | qWarning() << "Signing failed"; |
1095 | return {}; | 1100 | return {}; |