summaryrefslogtreecommitdiffstats
path: root/framework/src/domain/mime/mimetreeparser/messagepart.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'framework/src/domain/mime/mimetreeparser/messagepart.cpp')
-rw-r--r--framework/src/domain/mime/mimetreeparser/messagepart.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
index fdcb6284..995ea811 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
@@ -838,15 +838,6 @@ void SignedMessagePart::startVerification()
838 } 838 }
839} 839}
840 840
841void SignedMessagePart::startVerification(const QByteArray &text, const QTextCodec *aCodec)
842{
843 startVerificationDetached(text, nullptr, QByteArray());
844
845 if (!mNode && mMetaData.isSigned) {
846 setText(aCodec->toUnicode(mVerifiedText));
847 }
848}
849
850void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime::Content *textNode, const QByteArray &signature) 841void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime::Content *textNode, const QByteArray &signature)
851{ 842{
852 mMetaData.isEncrypted = false; 843 mMetaData.isEncrypted = false;
@@ -881,7 +872,6 @@ void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime:
881void SignedMessagePart::setVerificationResult(const GpgME::VerificationResult &result, bool parseText, const QByteArray &plainText) 872void SignedMessagePart::setVerificationResult(const GpgME::VerificationResult &result, bool parseText, const QByteArray &plainText)
882{ 873{
883 auto signatures = result.signatures(); 874 auto signatures = result.signatures();
884 mVerifiedText = plainText;
885 mMetaData.auditLogError = result.error(); 875 mMetaData.auditLogError = result.error();
886 if (!signatures.empty()) { 876 if (!signatures.empty()) {
887 mMetaData.isSigned = true; 877 mMetaData.isSigned = true;
@@ -889,9 +879,9 @@ void SignedMessagePart::setVerificationResult(const GpgME::VerificationResult &r
889 if (mNode && parseText) { 879 if (mNode && parseText) {
890 mOtp->mNodeHelper->setPartMetaData(mNode, mMetaData); 880 mOtp->mNodeHelper->setPartMetaData(mNode, mMetaData);
891 } 881 }
892 if (!mVerifiedText.isEmpty() && parseText) { 882 if (!plainText.isEmpty() && parseText) {
893 auto tempNode = new KMime::Content(); 883 auto tempNode = new KMime::Content();
894 tempNode->setBody(mVerifiedText); 884 tempNode->setBody(plainText);
895 tempNode->parse(); 885 tempNode->parse();
896 bindLifetime(tempNode); 886 bindLifetime(tempNode);
897 887