Reduced the messagetreeparser to aproximately what we actually require

While in a much more managable state it's still not pretty.
However, further refactoring can now gradually happen as we need to do
further work on it.

Things that should happen eventually:
* Simplify the logic that creates the messageparts (we don't need the  whole formatter plugin complexity)
* Get rid of the nodehelper (let the parts hold the necessary data)
* Get rid of partmetadata (let the part handleit)

1 files changed, 85 insertions, 0 deletions

diff --git a/framework/src/domain/mime/mimetreeparser/multipartencrypted.cpp b/framework/src/domain/mime/mimetreeparser/multipartencrypted.cpp
new file mode 100644
index 00000000..cac9853d
--- /dev/null
+++ b/framework/src/domain/mime/mimetreeparser/multipartencrypted.cpp
@@ -0,0 +1,85 @@
+/*
+   Copyright (c) 2016 Sandro Knauß <sknauss@kde.org>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or (at your
+   option) any later version.
+
+   This library is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+   License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+*/
+
+#include "multipartencrypted.h"
+
+#include "utils.h"
+
+#include "objecttreeparser.h"
+#include "messagepart.h"
+
+#include <KMime/Content>
+
+#include <QGpgME/Protocol>
+
+#include "mimetreeparser_debug.h"
+
+using namespace MimeTreeParser;
+
+const MultiPartEncryptedBodyPartFormatter *MultiPartEncryptedBodyPartFormatter::self;
+
+const Interface::BodyPartFormatter *MultiPartEncryptedBodyPartFormatter::create()
+{
+    if (!self) {
+        self = new MultiPartEncryptedBodyPartFormatter();
+    }
+    return self;
+}
+
+MessagePart::Ptr MultiPartEncryptedBodyPartFormatter::process(Interface::BodyPart &part) const
+{
+    KMime::Content *node = part.content();
+
+    if (node->contents().isEmpty()) {
+        Q_ASSERT(false);
+        return MessagePart::Ptr();
+    }
+
+    const QGpgME::Protocol *useThisCryptProto = nullptr;
+
+    /*
+    ATTENTION: This code is to be replaced by the new 'auto-detect' feature. --------------------------------------
+    */
+    KMime::Content *data = findTypeInDirectChilds(node, "application/octet-stream");
+    if (data) {
+        useThisCryptProto = QGpgME::openpgp();
+    }
+    if (!data) {
+        data = findTypeInDirectChilds(node, "application/pkcs7-mime");
+        if (data) {
+            useThisCryptProto = QGpgME::smime();
+        }
+    }
+    /*
+    ---------------------------------------------------------------------------------------------------------------
+    */
+
+    if (!data) {
+        return MessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), node->contents().at(0), false));
+    }
+
+    EncryptedMessagePart::Ptr mp(new EncryptedMessagePart(part.objectTreeParser(),
+                                 data->decodedText(),
+                                 useThisCryptProto,
+                                 part.nodeHelper()->fromAsString(data),
+                                 node,
+                                 data));
+    mp->setIsEncrypted(true);
+    return mp;
+}