Differential D11158 Diff 29018 framework/src/domain/mime/mailtemplates.cpp

Changeset View

Standalone View

View Options

framework/src/domain/mime/mailtemplates.cpp

Context not available.
1025 return mailboxes; 1025​ return mailboxes;
1026} 1026​}
1027 1027​
1028KMime::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) {
Context not available.
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(std::move(bodyPart), signingKeys, encryptionKeys, attachedKey);
1093 if (!result) { 1097​ if (!result) {
1094 qWarning() << "Signing failed"; 1098​ qWarning() << "Crypto failed";
1095 return {}; 1099​ return {};
1096 } 1100​ }
1097 bodyData = result->encodedContent(); 1101​ bodyData = result.value()->encodedContent();
1098 } else { 1102​ } else {
1099 if (!bodyPart->contentType(false)) { 1103​ if (!bodyPart->contentType(false)) {
1100 bodyPart->contentType(true)->setMimeType("text/plain"); 1104​ bodyPart->contentType(true)->setMimeType("text/plain");
Context not available.