Make nested mails work with mailviewer

1 files changed, 43 insertions, 7 deletions

diff --git a/framework/domain/mimetreeparser/interface.cpp b/framework/domain/mimetreeparser/interface.cpp
index efa0fd40..596dc152 100644
--- a/framework/domain/mimetreeparser/interface.cpp
+++ b/framework/domain/mimetreeparser/interface.cpp
@@ -36,14 +36,24 @@
 class MailMimePrivate
 {
 public:
-    KMime::Content *mNode;
+    MailMimePrivate(MailMime *p);
+
     MailMime *q;
+    KMime::Content *mNode;
+    std::shared_ptr<MailMime> parent;
 };
 
+MailMimePrivate::MailMimePrivate(MailMime* p)
+    : q(p)
+    , mNode(nullptr)
+    , parent(nullptr)
+{
+}
+
+
 MailMime::MailMime()
-    : d(std::unique_ptr<MailMimePrivate>(new MailMimePrivate()))
+    : d(std::unique_ptr<MailMimePrivate>(new MailMimePrivate(this)))
 {
-    d->q = this;
 }
 
 bool MailMime::isFirstTextPart() const
@@ -54,6 +64,14 @@ bool MailMime::isFirstTextPart() const
     return (d->mNode->topLevel()->textContent() == d->mNode);
 }
 
+bool MailMime::isFirstPart() const
+{
+   if (!d->mNode || !d->mNode->parent()) {
+       return false;
+   }
+   return (d->mNode->parent()->contents().first() == d->mNode);
+}
+
 bool MailMime::isTopLevelPart() const
 {
     if (!d->mNode) {
@@ -108,6 +126,15 @@ QMimeType MailMime::mimetype() const
     return mimeDb.mimeTypeForName(ct->mimeType());
 }
 
+MailMime::Ptr MailMime::parent() const
+{
+    if (!d->parent) {
+        d->parent = std::shared_ptr<MailMime>(new MailMime());
+        d->parent->d->mNode = d->mNode->parent();
+    }
+    return d->parent;
+}
+
 class PartPrivate
 {
 public:
@@ -285,6 +312,11 @@ MailMime::Ptr Part::mailMime() const
     return d->mailMime();
 }
 
+Part *Part::parent() const
+{
+    return d->parent();
+}
+
 class ContentPrivate
 {
 public:
@@ -738,12 +770,16 @@ QVector<Part::Ptr> Parser::collectContentParts() const
                                     }
 
                                     {
-                                        const auto parent = content->parent();
-                                        if (parent) {
-                                            const auto _mime = parent->mailMime();
+                                        auto _mime = content->parent()->mailMime();
+                                        while (_mime) {
                                             if (_mime && (_mime->isTopLevelPart() || _mime->isFirstTextPart())) {
                                                 return true;
                                             }
+                                            if (_mime->isFirstPart()) {
+                                                _mime = _mime->parent();
+                                            } else {
+                                                break;
+                                            }
                                         }
                                     }
                                     const auto cd = mime->disposition();
@@ -830,4 +866,4 @@ QVector<Part::Ptr> Parser::collect(const Part::Ptr &start, std::function<bool(co
         }
     }
     return ret;
-}
\ No newline at end of file
+}