From 702f5124db8808363ccae060c86389f8a76b34b4 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 7 Dec 2017 14:21:40 +0100 Subject: Simplified code --- .../src/domain/mime/mimetreeparser/messagepart.cpp | 27 ++++++++++------------ 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp index 2f399226..a4fc7265 100644 --- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp +++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp @@ -955,22 +955,19 @@ void SignedMessagePart::setVerificationResult(const CryptoBodyPartMemento *m, KM if (mMetaData.isSigned) { sigStatusToMetaData(); - if (mNode) { - if (!textNode) { - mOtp->mNodeHelper->setPartMetaData(mNode, mMetaData); - - if (!mVerifiedText.isEmpty()) { - auto tempNode = new KMime::Content(); - tempNode->setContent(KMime::CRLFtoLF(mVerifiedText.constData())); - tempNode->parse(); - bindLifetime(tempNode); - - if (!tempNode->head().isEmpty()) { - tempNode->contentDescription()->from7BitString("signed data"); - } - - parseInternal(tempNode, false); + if (mNode && !textNode) { + mOtp->mNodeHelper->setPartMetaData(mNode, mMetaData); + if (!mVerifiedText.isEmpty()) { + auto tempNode = new KMime::Content(); + tempNode->setContent(KMime::CRLFtoLF(mVerifiedText.constData())); + tempNode->parse(); + bindLifetime(tempNode); + + if (!tempNode->head().isEmpty()) { + tempNode->contentDescription()->from7BitString("signed data"); } + + parseInternal(tempNode, false); } } } -- cgit v1.2.3