10 files changed, 461 insertions, 6 deletions

diff --git a/applications/kube-mail/package/contents/ui/SingleMailView.qml b/applications/kube-mail/package/contents/ui/SingleMailView.qml
index caec88dd..b6163798 100644
--- a/applications/kube-mail/package/contents/ui/SingleMailView.qml
+++ b/applications/kube-mail/package/contents/ui/SingleMailView.qml
@@ -60,8 +60,11 @@ Item {
                     text: model.subject
                 }
 
-                Label {
+                /*Label {
                     text: model.mimeMessage
+                }*/
+                Label {
+                    text: model.renderedMessage
                 }
             }
         }
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index d59061d2..0b2b505d 100644
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -16,12 +16,22 @@ include(KDEInstallDirs)
 
 find_package(Qt5 COMPONENTS REQUIRED Core Qml)
 
+find_package(KF5Otp "5.1.42" CONFIG REQUIRED)
+find_package(KF5Mime "4.87.0" CONFIG REQUIRED)
+find_package(Akonadi2Common CONFIG REQUIRED)
+find_package(KF5Async)
+find_package(KF5Libkleo)
+
 set(CMAKE_AUTOMOC ON)
 add_definitions("-Wall -std=c++0x -g")
 include_directories(.)
 include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/common)
 include_directories(SYSTEM /work/install/include/)
 include_directories(SYSTEM /work/install/include/KF5/)
+include_directories(SYSTEM /work/install/include/KF5/KIconThemes)
+include_directories(SYSTEM /work/install/include/KF5/KMime)
+include_directories(SYSTEM /work/install/include/KF5/KService)
+include_directories(SYSTEM /work/install/include/KF5/KCoreAddons)
 
 enable_testing()
 
diff --git a/framework/mail/CMakeLists.txt b/framework/mail/CMakeLists.txt
index 6188c93c..9a32cc83 100644
--- a/framework/mail/CMakeLists.txt
+++ b/framework/mail/CMakeLists.txt
@@ -6,14 +6,15 @@ set(mailplugin_SRCS
     folderlistmodel.cpp
     folderlistcontroller.cpp
     actions/akonadiactions.cpp
+    objecttreesource.cpp
+    stringhtmlwriter.cpp
 )
 
 add_library(mailplugin SHARED ${mailplugin_SRCS})
 
 qt5_use_modules(mailplugin Core Quick Qml)
 
-target_link_libraries(mailplugin /work/install/lib64/libakonadi2common.so actionplugin)
-#target_link_libraries(mailplugin /home/mike/projects/_install/lib/x86_64-linux-gnu/libakonadi2common.so)
+target_link_libraries(mailplugin actionplugin KF5::akonadi2common KF5::Otp actionplugin)
 
 install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail)
 install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail)
diff --git a/framework/mail/maillistmodel.cpp b/framework/mail/maillistmodel.cpp
index 3ed50ad6..2314e155 100644
--- a/framework/mail/maillistmodel.cpp
+++ b/framework/mail/maillistmodel.cpp
@@ -20,7 +20,13 @@
 
 #include "maillistmodel.h"
 
+#include "stringhtmlwriter.h"
+#include "objecttreesource.h"
+
 #include <QFile>
+#include <QImage>
+#include <KF5/MessageViewer/ObjectTreeParser>
+#include <KF5/MessageViewer/CSSHelperBase>
 
 MailListModel::MailListModel(QObject *parent)
     : QIdentityProxyModel()
@@ -45,6 +51,7 @@ QHash< int, QByteArray > MailListModel::roleNames() const
     roles[Important] = "important";
     roles[Id] = "id";
     roles[MimeMessage] = "mimeMessage";
+    roles[RenderedMessage] = "renderedMessage";
     roles[DomainObject] = "domainObject";
 
     return roles;
@@ -81,6 +88,37 @@ QVariant MailListModel::data(const QModelIndex &idx, int role) const
             }
             return "Failed to read mail.";
         }
+        case RenderedMessage: {
+            auto filename = srcIdx.sibling(srcIdx.row(), 6).data(Qt::DisplayRole).toString();
+            QFile file(filename);
+            if (file.open(QFile::ReadOnly)) {
+                const auto mailData = KMime::CRLFtoLF(file.readAll());
+                KMime::Message::Ptr msg(new KMime::Message);
+                msg->setContent(mailData);
+                msg->parse();
+
+                // render the mail
+                StringHtmlWriter htmlWriter;
+                QImage paintDevice;
+                MessageViewer::CSSHelperBase cssHelper(&paintDevice);
+                MessageViewer::NodeHelper nodeHelper;
+                ObjectTreeSource source(&htmlWriter, &cssHelper);
+                MessageViewer::ObjectTreeParser otp(&source, &nodeHelper);
+
+                htmlWriter.begin(QString());
+                htmlWriter.queue(cssHelper.htmlHead(false));
+
+                otp.parseObjectTree(msg.data());
+
+                htmlWriter.queue(QStringLiteral("</body></html>"));
+                htmlWriter.end();
+
+                return htmlWriter.html();
+            } else {
+                qWarning() << "Failed to open the file";
+            }
+            return "Failed to read mail.";
+        }
     }
     return QIdentityProxyModel::data(idx, role);
 }
diff --git a/framework/mail/maillistmodel.h b/framework/mail/maillistmodel.h
index 22146eac..1d56e6b8 100644
--- a/framework/mail/maillistmodel.h
+++ b/framework/mail/maillistmodel.h
@@ -47,7 +47,8 @@ public:
         Important,
         Id,
         MimeMessage,
-        DomainObject
+        DomainObject,
+        RenderedMessage
     };
 
     QHash<int, QByteArray> roleNames() const;
diff --git a/framework/mail/objecttreesource.cpp b/framework/mail/objecttreesource.cpp
new file mode 100644
index 00000000..1aca5d54
--- /dev/null
+++ b/framework/mail/objecttreesource.cpp
@@ -0,0 +1,144 @@
+/*
+  Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
+  Copyright (c) 2009 Andras Mantia <andras@kdab.net>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program 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 General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#include "objecttreesource.h"
+
+#include <MessageViewer/AttachmentStrategy>
+
+class ObjectSourcePrivate
+{
+public:
+    ObjectSourcePrivate()
+        : mWriter(0)
+        , mCSSHelper(0)
+        , mAllowDecryption(false)
+        , mHtmlLoadExternal(false)
+        , mHtmlMail(false)
+    {
+
+    }
+    MessageViewer::HtmlWriter *mWriter;
+    MessageViewer::CSSHelperBase *mCSSHelper;
+    bool mAllowDecryption;
+    bool mHtmlLoadExternal;
+    bool mHtmlMail;
+};
+
+ObjectTreeSource::ObjectTreeSource(MessageViewer::HtmlWriter *writer,
+                                   MessageViewer::CSSHelperBase *cssHelper)
+        : MessageViewer::ObjectTreeSourceIf()
+        , d(new ObjectSourcePrivate)
+    {
+        d->mWriter = writer;
+        d->mCSSHelper = cssHelper;
+    }
+
+ObjectTreeSource::~ObjectTreeSource()
+{
+    delete d;
+}
+
+void ObjectTreeSource::setAllowDecryption(bool allowDecryption)
+{
+    d->mAllowDecryption = allowDecryption;
+}
+
+MessageViewer::HtmlWriter *ObjectTreeSource::htmlWriter()
+{
+    return d->mWriter;
+}
+MessageViewer::CSSHelperBase *ObjectTreeSource::cssHelper()
+{
+    return d->mCSSHelper;
+}
+
+bool ObjectTreeSource::htmlLoadExternal()
+{
+    return d->mHtmlLoadExternal;
+}
+
+void ObjectTreeSource::setHtmlLoadExternal(bool loadExternal)
+{
+    d->mHtmlLoadExternal = loadExternal;
+}
+
+bool ObjectTreeSource::htmlMail()
+{
+    return d->mHtmlMail;
+}
+
+void ObjectTreeSource::setHtmlMail(bool htmlMail)
+{
+    d->mHtmlMail = htmlMail;
+}
+
+bool ObjectTreeSource::decryptMessage()
+{
+    return d->mAllowDecryption;
+}
+
+bool ObjectTreeSource::showSignatureDetails() 
+{
+    return true;
+}
+
+int ObjectTreeSource::levelQuote() 
+{
+    return 1;
+}
+
+const QTextCodec *ObjectTreeSource::overrideCodec()
+{
+    return Q_NULLPTR;
+}
+
+QString ObjectTreeSource::createMessageHeader(KMime::Message *message) 
+{
+    return QString();
+}
+
+const MessageViewer::AttachmentStrategy *ObjectTreeSource::attachmentStrategy()
+{
+    return MessageViewer::AttachmentStrategy::smart();
+}
+
+QObject *ObjectTreeSource::sourceObject() 
+{
+    return Q_NULLPTR;
+}
+
+void ObjectTreeSource::setHtmlMode(MessageViewer::Util::HtmlMode mode)
+{
+      Q_UNUSED(mode);
+}
+
+bool ObjectTreeSource::autoImportKeys()
+{
+    return false;
+}
+
+bool ObjectTreeSource::showEmoticons()
+{
+    return false;
+}
+
+bool ObjectTreeSource::showExpandQuotesMark()
+{
+    return false;
+}
\ No newline at end of file
diff --git a/framework/mail/objecttreesource.h b/framework/mail/objecttreesource.h
new file mode 100644
index 00000000..4823999f
--- /dev/null
+++ b/framework/mail/objecttreesource.h
@@ -0,0 +1,57 @@
+/*
+  Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
+  Copyright (c) 2009 Andras Mantia <andras@kdab.net>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program 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 General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#ifndef MAILVIEWER_OBJECTTREEEMPTYSOURCE_H
+#define MAILVIEWER_OBJECTTREEEMPTYSOURCE_H
+
+#include <MessageViewer/ObjectTreeSourceIf>
+
+class QString;
+
+class ObjectSourcePrivate;
+class ObjectTreeSource : public MessageViewer::ObjectTreeSourceIf
+{
+public:
+    ObjectTreeSource(MessageViewer::HtmlWriter *writer,
+                     MessageViewer::CSSHelperBase *cssHelper);
+    virtual ~ObjectTreeSource();
+    void setHtmlLoadExternal(bool loadExternal);
+    void setHtmlMail(bool htmlMail);
+    bool htmlMail() Q_DECL_OVERRIDE;
+    bool decryptMessage() Q_DECL_OVERRIDE;
+    bool htmlLoadExternal() Q_DECL_OVERRIDE;
+    bool showSignatureDetails() Q_DECL_OVERRIDE;
+    void setHtmlMode(MessageViewer::Util::HtmlMode mode) Q_DECL_OVERRIDE;
+    void setAllowDecryption(bool allowDecryption);
+    int levelQuote() Q_DECL_OVERRIDE;
+    const QTextCodec *overrideCodec() Q_DECL_OVERRIDE;
+    QString createMessageHeader(KMime::Message *message) Q_DECL_OVERRIDE;
+    const MessageViewer::AttachmentStrategy *attachmentStrategy() Q_DECL_OVERRIDE;
+    MessageViewer::HtmlWriter *htmlWriter() Q_DECL_OVERRIDE;
+    MessageViewer::CSSHelperBase *cssHelper() Q_DECL_OVERRIDE;
+    QObject *sourceObject() Q_DECL_OVERRIDE;
+    bool autoImportKeys() Q_DECL_OVERRIDE;
+    bool showEmoticons() Q_DECL_OVERRIDE;
+    bool showExpandQuotesMark() Q_DECL_OVERRIDE;
+private:
+    ObjectSourcePrivate *const d;
+};
+
+#endif
+
diff --git a/framework/mail/stringhtmlwriter.cpp b/framework/mail/stringhtmlwriter.cpp
new file mode 100644
index 00000000..2c84dc6f
--- /dev/null
+++ b/framework/mail/stringhtmlwriter.cpp
@@ -0,0 +1,134 @@
+/*  -*- c++ -*-
+    filehtmlwriter.cpp
+
+    This file is part of KMail, the KDE mail client.
+    Copyright (c) 2003 Marc Mutz <mutz@kde.org>
+
+    KMail is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License, version 2, as
+    published by the Free Software Foundation.
+
+    KMail 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
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#include "stringhtmlwriter.h"
+
+#include <QDebug>
+#include <QTextStream>
+
+StringHtmlWriter::StringHtmlWriter()
+    : MessageViewer::HtmlWriter()
+    , mState(Ended)
+{
+}
+
+StringHtmlWriter::~StringHtmlWriter()
+{
+}
+
+void StringHtmlWriter::begin(const QString &css)
+{
+    if (mState != Ended) {
+        qWarning() << "begin() called on non-ended session!";
+        reset();
+    }
+
+    mState = Begun;
+    mExtraHead.clear();
+    mHtml.clear();
+
+    if (!css.isEmpty()) {
+        write(QLatin1String("<!-- CSS Definitions \n") + css + QLatin1String("-->\n"));
+    }
+}
+
+void StringHtmlWriter::end()
+{
+    if (mState != Begun) {
+        qWarning() << "Called on non-begun or queued session!";
+    }
+
+    if (!mExtraHead.isEmpty()) {
+        insertExtraHead();
+        mExtraHead.clear();
+    }
+    mState = Ended;
+}
+
+void StringHtmlWriter::reset()
+{
+    if (mState != Ended) {
+        mHtml.clear();
+        mExtraHead.clear();
+        mState = Begun; // don't run into end()'s warning
+        end();
+        mState = Ended;
+    }
+}
+
+void StringHtmlWriter::write(const QString &str)
+{
+    if (mState != Begun) {
+        qWarning() << "Called in Ended or Queued state!";
+    }
+    mHtml.append(str);
+}
+
+void StringHtmlWriter::queue(const QString &str)
+{
+    write(str);
+}
+
+void StringHtmlWriter::flush()
+{
+    mState = Begun; // don't run into end()'s warning
+    end();
+}
+
+void StringHtmlWriter::embedPart(const QByteArray &contentId, const QString &url)
+{
+    write("<!-- embedPart(contentID=" + contentId + ", url=" + url + ") -->\n");
+}
+void StringHtmlWriter::extraHead(const QString &extraHead)
+{
+    if (mState != Ended) {
+        qWarning() << "Called on non-started session!";
+    }
+    mExtraHead.append(extraHead);
+}
+
+
+void StringHtmlWriter::insertExtraHead()
+{
+    const QString headTag(QStringLiteral("<head>"));
+    const int index = mHtml.indexOf(headTag);
+    if (index != -1) {
+        mHtml.insert(index + headTag.length(), mExtraHead);
+    }
+}
+
+QString StringHtmlWriter::html() const
+{
+    if (mState != Ended) {
+        qWarning() << "Called on non-ended session!";
+    }
+    return mHtml;
+}
diff --git a/framework/mail/stringhtmlwriter.h b/framework/mail/stringhtmlwriter.h
new file mode 100644
index 00000000..0805d027
--- /dev/null
+++ b/framework/mail/stringhtmlwriter.h
@@ -0,0 +1,68 @@
+/*  -*- c++ -*-
+
+    Copyright (c) 2016 Sandro Knauß <sknauss@kde.org>
+
+    Kube is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License, version 2, as
+    published by the Free Software Foundation.
+
+    Kube 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
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifndef __KUBE_FRAMEWORK_MAIL_STRINGHTMLWRITER_H__
+#define __KUBE_FRAMEWORK_MAIL_STRINGHTMLWRITER_H__
+
+#include <MessageViewer/HtmlWriter>
+
+#include <QFile>
+#include <QTextStream>
+
+class QString;
+
+class StringHtmlWriter : public MessageViewer::HtmlWriter
+{
+public:
+    explicit StringHtmlWriter();
+    virtual ~StringHtmlWriter();
+
+    void begin(const QString &cssDefs) Q_DECL_OVERRIDE;
+    void end() Q_DECL_OVERRIDE;
+    void reset() Q_DECL_OVERRIDE;
+    void write(const QString &str) Q_DECL_OVERRIDE;
+    void queue(const QString &str) Q_DECL_OVERRIDE;
+    void flush() Q_DECL_OVERRIDE;
+    void embedPart(const QByteArray &contentId, const QString &url) Q_DECL_OVERRIDE;
+    void extraHead(const QString &str) Q_DECL_OVERRIDE;
+
+    QString html() const;
+private:
+    void insertExtraHead();
+
+    QString mHtml;
+    QString mExtraHead;
+    enum State {
+        Begun,
+        Queued,
+        Ended
+    } mState;
+};
+
+#endif // __MESSAGEVIEWER_FILEHTMLWRITER_H__
diff --git a/framework/settings/CMakeLists.txt b/framework/settings/CMakeLists.txt
index b0a8fe28..5d61851f 100644
--- a/framework/settings/CMakeLists.txt
+++ b/framework/settings/CMakeLists.txt
@@ -9,8 +9,7 @@ add_library(settingsplugin SHARED ${settingsplugin_SRCS})
 
 qt5_use_modules(settingsplugin Core Quick Qml)
 
-target_link_libraries(settingsplugin /work/install/lib64/libakonadi2common.so)
-#target_link_libraries(settingsplugin /home/mike/projects/_install/lib/x86_64-linux-gnu/libakonadi2common.so)
+target_link_libraries(settingsplugin KF5::akonadi2common)
 
 install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings)
 install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings)
\ No newline at end of file