Merge lp:~bobo-324/dekko/customScheme into lp:dekko/0.3

[Boren Zhang]

This patch let you view cid image in html message by registering a networkAccessManagerFactory( MsgPartNetworkAccessFactory) to QMLEngin.

MsgPartNetworkAccessFactory is register as a context property "msgPartNetworkAccessFactory", so that we can set message modelIndex using function "msgPartNetworkAccessFactory.setMessageIndex()" in QML before displaying html message.

Using msgPartNetworkAccessFactory.setMessageIndex() will send messageIndex to all networkAccessManager that has been created. Because they will reuse networkAccessManager for different account.

Previewing image should also work now.

[Dan Chapman  (dpniel)]

LGTM and works as expected. We should get a bug filed though for oxide not liking the the text/html; charset... bug. It would be much better to just give oxide the trojita-imap url here. Anyway it's working for now :-D \o/ no more QtWebkit in our future!!

Thanks for your work on this

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-11-21 05:16:54 +0000
+++ CMakeLists.txt	2014-12-01 18:56:12 +0000
@@ -480,6 +480,7 @@
         ${DEKKO_UBUNTU_PATH}/app/PartWidget/SectionType.cpp
         ${DEKKO_UBUNTU_PATH}/app/Utils/Path.cpp
         ${DEKKO_UBUNTU_PATH}/app/Utils/PlainTextFormatter.cpp
+        ${DEKKO_UBUNTU_PATH}/app/Network/MsgPartNetAccessManagerFactory.cpp
     )
 
     set(DEKKO_QML_COMPOSER

=== modified file 'qml/MessageView/HtmlPart.qml'
--- qml/MessageView/HtmlPart.qml	2014-11-07 18:25:29 +0000
+++ qml/MessageView/HtmlPart.qml	2014-12-01 18:56:12 +0000
@@ -18,7 +18,8 @@
 import QtQuick 2.2
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
-import Ubuntu.Web 0.2
+//import Ubuntu.Web 0.2
+import com.canonical.Oxide 1.3
 import DekkoCore 0.1
 
 WebView {
@@ -35,6 +36,9 @@
 
     property alias msgPartIndex: plainTextFormatter.msgPartIndex
 
+    context: WebContext {
+        allowedExtraUrlSchemes: ["cid"]
+    }
     //swtich section while webview is scrolling will crash
     function disableSectionForAWhile() {
         oneMessagePage.head.sections.enabled = false;

=== modified file 'qml/MessageView/ImagePart.qml'
--- qml/MessageView/ImagePart.qml	2014-10-31 17:59:05 +0000
+++ qml/MessageView/ImagePart.qml	2014-12-01 18:56:12 +0000
@@ -20,7 +20,8 @@
 import Ubuntu.Components.Popups 1.0
 
 Image {
-    Label {
-        text: "previewing image not supported"
+    onSourceSizeChanged: {
+        width = Math.min(oneMessagePage.width - units.gu(6), sourceSize.width)
+        height = width * sourceSize.height / sourceSize.width;
     }
 }

=== modified file 'qml/MessageView/OneMessagePage.qml'
--- qml/MessageView/OneMessagePage.qml	2014-11-07 19:19:24 +0000
+++ qml/MessageView/OneMessagePage.qml	2014-12-01 18:56:12 +0000
@@ -146,6 +146,7 @@
                 right: parent.right
             }
             Component.onCompleted: {
+                msgPartNetAccessManagerFactory.setMessageIndex(imapAccess.oneMessageModel.messageIndex);
                 partWidgetFactory.setNetAccessManager(imapAccess.msgQNAM);
                 partWidgetFactory.setNetWatcher(imapAccess.networkWatcher);
                 partWidgetFactory.create(imapAccess.oneMessageModel.messageFirstChildIndex,

=== added directory 'src/app/Network'
=== added file 'src/app/Network/MsgPartNetAccessManagerFactory.cpp'
--- src/app/Network/MsgPartNetAccessManagerFactory.cpp	1970-01-01 00:00:00 +0000
+++ src/app/Network/MsgPartNetAccessManagerFactory.cpp	2014-12-01 18:56:12 +0000
@@ -0,0 +1,45 @@
+/* Copyright (C) 2014 Boren Zhang <[e-mail]>
+
+   This file is part of Dekko email client for Ubuntu Devices/
+
+   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) version 3
+
+   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, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "MsgPartNetAccessManagerFactory.h"
+
+namespace Dekko {
+
+void MsgPartNetAccessManagerFactory::setMessageIndex(const QModelIndex &messageIndex)
+{
+    m_messageIndex = messageIndex;
+    for (int i = 0; i < m_mpnamList.length(); i++) {
+        m_mpnamList[i]->setModelMessage(messageIndex);
+    }
+}
+
+QNetworkAccessManager *MsgPartNetAccessManagerFactory::create(QObject *parent)
+{
+    Imap::Network::MsgPartNetAccessManager * mpnam = new Imap::Network::MsgPartNetAccessManager(parent);
+    mpnam->setModelMessage(m_messageIndex);
+    connect(mpnam, SIGNAL(destroyed(QObject*)), this, SLOT(handleManagerDestroyed(QObject *)));
+    m_mpnamList.append(mpnam);
+    return mpnam;
+}
+
+void MsgPartNetAccessManagerFactory::handleManagerDestroyed(QObject *destroyedObject)
+{
+    m_mpnamList.removeOne(qobject_cast<Imap::Network::MsgPartNetAccessManager *>(destroyedObject));
+}
+
+}

=== added file 'src/app/Network/MsgPartNetAccessManagerFactory.h'
--- src/app/Network/MsgPartNetAccessManagerFactory.h	1970-01-01 00:00:00 +0000
+++ src/app/Network/MsgPartNetAccessManagerFactory.h	2014-12-01 18:56:12 +0000
@@ -0,0 +1,43 @@
+/* Copyright (C) 2014 Boren Zhang <[e-mail]>
+
+   This file is part of Dekko email client for Ubuntu Devices/
+
+   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) version 3
+
+   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, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef MSGPARTNETACCESSMANAGERFACTORY_H
+#define MSGPARTNETACCESSMANAGERFACTORY_H
+
+#include <QQmlNetworkAccessManagerFactory>
+#include <QModelIndex>
+
+#include "Imap/Network/MsgPartNetAccessManager.h"
+
+namespace Dekko {
+
+class MsgPartNetAccessManagerFactory : public QObject, public QQmlNetworkAccessManagerFactory
+{
+    Q_OBJECT
+public:
+    Q_INVOKABLE void setMessageIndex(const QModelIndex &messageIndex);
+    virtual QNetworkAccessManager *create(QObject *parent);
+public slots:
+    void handleManagerDestroyed(QObject * destroyedObject);
+private:
+    QList<Imap::Network::MsgPartNetAccessManager *> m_mpnamList;
+    QModelIndex m_messageIndex;
+};
+
+}
+#endif // MSGPARTNETACCESSMANAGERFACTORY_H

=== modified file 'src/app/PartWidget/NewPartWidget.cpp'
--- src/app/PartWidget/NewPartWidget.cpp	2014-11-07 17:31:19 +0000
+++ src/app/PartWidget/NewPartWidget.cpp	2014-12-01 18:56:12 +0000
@@ -202,6 +202,9 @@
 
     if (isPlainText || isHtml) {
         item->setProperty("msgPartIndex", partIndex);
+    //BUG: if set url in here, Oxide will display pure html text, it seems that it doesn't recognize mimeType "text/html; charset=utf8"
+//    } else if (isHtml) {
+//        item->setProperty("url", url);
     } else {
         item->setProperty("source", url);
     }

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2014-11-07 17:31:19 +0000
+++ src/app/main.cpp	2014-12-01 18:56:12 +0000
@@ -41,6 +41,7 @@
 #include "app/PartWidget/SectionType.h"
 #include "app/Utils/Path.h"
 #include "app/Utils/PlainTextFormatter.h"
+#include "app/Network/MsgPartNetAccessManagerFactory.h"
 #include "Imap/Model/ImapAccess.h"
 #include "Imap/Model/ThreadingMsgListModel.h"
 #include "MSA/Account.h"
@@ -135,6 +136,10 @@
             .arg(QDir::homePath()));
     qQuickViewer->engine()->rootContext()->setContextProperty(QLatin1String("addressbookStoreLocation"), QVariant::fromValue(addressbookStoreLocation));
 
+    Dekko::MsgPartNetAccessManagerFactory msgPartNetAccessManagerFactory;
+    qQuickViewer->engine()->setNetworkAccessManagerFactory(&msgPartNetAccessManagerFactory);
+    qQuickViewer->engine()->rootContext()->setContextProperty(QLatin1String("msgPartNetAccessManagerFactory"), &msgPartNetAccessManagerFactory);
+
     registerDekkoTypes("DekkoCore");
     registerTrojitaCoreTypes("TrojitaCore");