From 5beca0c6212af94a06c55c85b46cf6a884f8ca75 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 26 Feb 2018 17:28:08 +0100
Subject: Using setContent instead of setBody will lead to a trailing newline

---
 framework/src/domain/mime/mimetreeparser/messagepart.cpp         | 2 +-
 framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp  | 5 +++--
 framework/src/domain/mime/mimetreeparser/tests/interfacetest.cpp | 8 +++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
index 5f14b7bd..a86969a3 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
@@ -893,7 +893,7 @@ void SignedMessagePart::setVerificationResult(const GpgME::VerificationResult &r
         }
         if (!mVerifiedText.isEmpty() && parseText) {
             auto tempNode = new KMime::Content();
-            tempNode->setContent(KMime::CRLFtoLF(mVerifiedText.constData()));
+            tempNode->setBody(mVerifiedText);
             tempNode->parse();
             bindLifetime(tempNode);
 
diff --git a/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp b/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp
index 4c03bbe2..32bffeb5 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp
+++ b/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp
@@ -68,13 +68,14 @@ private slots:
         otp.print();
         auto partList = otp.collectContentParts();
         QCOMPARE(partList.size(), 1);
-        auto part = partList[0].dynamicCast<MimeTreeParser::SignedMessagePart>();
+        auto part = partList[0];
         QVERIFY(bool(part));
 
         qWarning() << part->metaObject()->className() << part->text() << part->partMetaData()->status;
         QVERIFY(part->text().startsWith("asdasd"));
         QCOMPARE(part->encryptions().size(), 1);
-        // auto enc = part->encryptions()[0];
+        auto enc = part->encryptions()[0];
+        QCOMPARE(enc->error(),  MimeTreeParser::MessagePart::NoError);
         // QCOMPARE(enc->errorType(), Encryption::NoError);
         // QCOMPARE(enc->errorString(), QString());
         // QCOMPARE((int) enc->recipients().size(), 2);
diff --git a/framework/src/domain/mime/mimetreeparser/tests/interfacetest.cpp b/framework/src/domain/mime/mimetreeparser/tests/interfacetest.cpp
index a8e608ba..69509715 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/interfacetest.cpp
+++ b/framework/src/domain/mime/mimetreeparser/tests/interfacetest.cpp
@@ -155,12 +155,10 @@ private slots:
         auto part = partList[0].dynamicCast<MimeTreeParser::MessagePart>();
         QVERIFY(bool(part));
         QCOMPARE(part->charset(), QStringLiteral("ISO-8859-1").toLocal8Bit());
-        QEXPECT_FAIL("", "gpgpme break encoding it seems, or the original file is broken", Continue);
-        QCOMPARE(part->text(), QString::fromUtf8("asdasd asd asd asdf sadf sdaf sadf äöü"));
+        QCOMPARE(part->text(), QString::fromUtf8("asdasd asd asd asdf sadf sdaf sadf öäü"));
 
-        //FIXME
-        // QCOMPARE(part->encryptions().size(), 1);
-        // QCOMPARE(part->signatures().size(), 1);
+        QCOMPARE(part->encryptions().size(), 1);
+        QCOMPARE(part->signatures().size(), 1);
         QCOMPARE(otp.collectAttachmentParts().size(), 0);
     }
 
-- 
cgit v1.2.3