2 files changed, 18 insertions, 48 deletions

diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
index 9c17aafc..3ab43990 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
@@ -558,64 +558,36 @@ QString MimeMessagePart::htmlContent() const
 AlternativeMessagePart::AlternativeMessagePart(ObjectTreeParser *otp, KMime::Content *node)
     : MessagePart(otp, QString(), node)
 {
-    KMime::Content *dataIcal = findTypeInDirectChilds(mNode, "text/calendar");
-    KMime::Content *dataHtml = findTypeInDirectChilds(mNode, "text/html");
-    KMime::Content *dataText = findTypeInDirectChilds(mNode, "text/plain");
+    if (auto dataIcal = findTypeInDirectChilds(mNode, "text/calendar")) {
+        mChildParts[Util::MultipartIcal] = MimeMessagePart::Ptr(new MimeMessagePart(mOtp, dataIcal, true));
+    }
+
+    if (auto dataText = findTypeInDirectChilds(mNode, "text/plain")) {
+        mChildParts[Util::MultipartPlain] = MimeMessagePart::Ptr(new MimeMessagePart(mOtp, dataText, true));
+    }
 
-    if (!dataHtml) {
+    if (auto dataHtml = findTypeInDirectChilds(mNode, "text/html")) {
+        mChildParts[Util::MultipartHtml] = MimeMessagePart::Ptr(new MimeMessagePart(mOtp, dataHtml, true));
+    } else {
         // If we didn't find the HTML part as the first child of the multipart/alternative, it might
         // be that this is a HTML message with images, and text/plain and multipart/related are the
         // immediate children of this multipart/alternative node.
         // In this case, the HTML node is a child of multipart/related.
-        dataHtml = findTypeInDirectChilds(mNode, "multipart/related");
-        if (dataHtml) {
-            const auto parts = dataHtml->contents();
+        if (auto data = findTypeInDirectChilds(mNode, "multipart/related")) {
+            const auto parts = data->contents();
             for (int i = 0; i < parts.size(); i++) {
                 const auto p = parts.at(i);
                 if (i == 0 ) {
-                    dataHtml = p;
+                    mChildParts[Util::MultipartHtml] = MimeMessagePart::Ptr(new MimeMessagePart(mOtp, p, true));
                 } else if (KMime::isAttachment(p)) {
                     appendSubPart(MimeMessagePart::Ptr(new MimeMessagePart(otp, p, true)));
                 }
             }
+        //Same for multipart/mixed
+        } else if (auto data  = findTypeInDirectChilds(mNode, "multipart/mixed")) {
+            //FIXME: This doesn't populate mChildParts but instead attaches subparts. That way we at least process all parts as we should.
+            parseInternal(data);
         }
-
-        // Still not found? Stupid apple mail actually puts the attachments inside of the
-        // multipart/alternative, which is wrong. Therefore we also have to look for multipart/mixed
-        // here.
-        // Do this only when prefering HTML mail, though, since otherwise the attachments are hidden
-        // when displaying plain text.
-        if (!dataHtml) {
-            dataHtml  = findTypeInDirectChilds(mNode, "multipart/mixed");
-            if (dataHtml) {
-                const auto parts = dataHtml->contents();
-                for (int i = 0; i < parts.size(); i++) {
-                    const auto p = parts.at(i);
-                    if (i == 0 ) {
-                        // FIXME multipart/mixed should display all types serially, not just one
-                        dataHtml = p;
-                    } else if (KMime::isAttachment(p)) {
-                        appendSubPart(MimeMessagePart::Ptr(new MimeMessagePart(otp, p, true)));
-                    }
-                }
-            }
-        }
-    }
-
-    if (dataIcal) {
-        mChildParts[Util::MultipartIcal] = MimeMessagePart::Ptr(new MimeMessagePart(mOtp, dataIcal, true));
-    }
-
-    if (dataText) {
-        mChildParts[Util::MultipartPlain] = MimeMessagePart::Ptr(new MimeMessagePart(mOtp, dataText, true));
-    }
-
-    if (dataHtml) {
-        mChildParts[Util::MultipartHtml] = MimeMessagePart::Ptr(new MimeMessagePart(mOtp, dataHtml, true));
-    }
-
-    if (mChildParts.isEmpty()) {
-        qCWarning(MIMETREEPARSER_LOG) << "no valid nodes";
     }
 }
 
diff --git a/framework/src/domain/mime/mimetreeparser/tests/mimetreeparsertest.cpp b/framework/src/domain/mime/mimetreeparser/tests/mimetreeparsertest.cpp
index 7fa651bc..a4b347e7 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/mimetreeparsertest.cpp
+++ b/framework/src/domain/mime/mimetreeparser/tests/mimetreeparsertest.cpp
@@ -426,12 +426,10 @@ private slots:
         otp.decryptParts();
         otp.print();
         auto partList = otp.collectContentParts();
-        QCOMPARE(partList.size(), 1);
+        QCOMPARE(partList.size(), 2);
         auto part = partList[0].dynamicCast<MimeTreeParser::MessagePart>();
         QCOMPARE(part->encryptions().size(), 0);
         QCOMPARE(part->signatures().size(), 0);
-        qWarning() << otp.plainTextContent();
-        qWarning() << otp.htmlContent();
         QCOMPARE(otp.plainTextContent(), QString::fromUtf8("Hello\n\n\n\nRegards\n\nFsdfsdf"));
         QCOMPARE(otp.htmlContent(), QString::fromUtf8("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=us-ascii\"></head><body style=\"word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;\" class=\"\"><strike class=\"\">Hello</strike><div class=\"\"><br class=\"\"></div><div class=\"\"></div></body></html><html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=us-ascii\"></head><body style=\"word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;\" class=\"\"><div class=\"\"></div><div class=\"\"><br class=\"\"></div><div class=\"\"><b class=\"\">Regards</b></div><div class=\"\"><b class=\"\"><br class=\"\"></b></div><div class=\"\">Fsdfsdf</div></body></html>"));