Merge lp:~mzanetti/reminders-app/enable-attaching-images into lp:reminders-app

[Michael Zanetti]

Enable attaching and uploading images

[lp:~mzanetti/reminders-app/enable-attaching-images]

46. By Michael Zanetti on 2014-01-23

cleanup

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:46
http://91.189.93.70:8080/job/reminders-app-ci/68/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/768
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/68
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/68

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/68/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Here's what I did:

1. Create a new note
2. Change the note's title
3. Add some text to the note
4. Press the attach button to attach an image
5. Pick an image from the device after the Content Hub brings up the gallery app
6. I'm now back to the note, although there is no visual feedback that the note has an attached image
7. I press save
8. On the list of notes, my new note is called Untitled, regardless of the fact that I did give it a name
9. When I click on the note to view it, the title is then as expected, and I can see the image in the note's body
10. However, when I go to sandbox.evernote.com, I can only see a note called Untitled, with no content at all (neither the text, nor the image)

Here's the debug output that I got when I performed these steps:
http://pastebin.ubuntu.com/6802363/

review: Needs Fixing

[David Planella (dpm)]

I forgot to say: after these steps have been followed, the 'add note' button no longer works.

[David Planella (dpm)]

More feedback:

- If I create a note and save it, and then go back to it and attach the image, then it all works: the note contains the image and that note + image appear in sandbox.evernote.com

However, the fact that after adding an image the 'add note' button no longer works still remains.

[Michael Zanetti (mzanetti)]

I can't reproduce it... the steps you described seem to work fine here.

[David Planella (dpm)]

LGTM, works now after having upgraded to the latest image.

review: Approve

[David Planella (dpm)]

review: Approve

=== modified file 'run_on_ubuntu_touch.sh'
--- run_on_ubuntu_touch.sh	2014-01-07 12:21:44 +0000
+++ run_on_ubuntu_touch.sh	2014-01-23 09:46:22 +0000
@@ -79,7 +79,7 @@
 }
 
 run() {
-    exec_with_ssh "cd $CODE_DIR/$BUILD_DIR/src/app/ && ./$BINARY --desktop_file_hint=$CODE_DIR/reminders-app.desktop"
+    exec_with_ssh "cd $CODE_DIR/$BUILD_DIR/src/app/ && ./$BINARY --desktop_file_hint=/home/phablet/$CODE_DIR/reminders-app.desktop"
 }
 
 set -- `getopt -n$0 -u -a --longoptions="setup,gdb,click,help" "sgch" "$@"`

=== modified file 'src/app/qml/reminders-app.qml'
--- src/app/qml/reminders-app.qml	2013-12-14 23:59:04 +0000
+++ src/app/qml/reminders-app.qml	2014-01-23 09:46:22 +0000
@@ -59,6 +59,18 @@
         }
     }
 
+    Connections {
+        target: NotesStore
+        onNoteCreated: {
+            var note = NotesStore.note(guid);
+            print("note created:", note.guid);
+            var component = Qt.createComponent(Qt.resolvedUrl("ui/EditNotePage.qml"));
+            var page = component.createObject(pageStack)
+            page.note = note;
+            pagestack.push(page);
+        }
+    }
+
     PageStack {
         id: pagestack
 

=== modified file 'src/app/qml/ui/EditNotePage.qml'
--- src/app/qml/ui/EditNotePage.qml	2013-12-17 23:19:58 +0000
+++ src/app/qml/ui/EditNotePage.qml	2014-01-23 09:46:22 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Content 0.1
 import Evernote 0.1
 import "../components"
 
@@ -51,6 +52,14 @@
 
         ToolbarButton {
             text: "attach"
+            onTriggered: {
+                priv.insertPosition = noteTextArea.cursorPosition;
+                note.richTextContent = noteTextArea.text;
+
+                priv.activeTransfer = ContentHub.importContent(ContentType.Pictures);
+                priv.activeTransfer.selectionType = ContentTransfer.Single;
+                priv.activeTransfer.start();
+            }
         }
         ToolbarButton {
             text: "camera"
@@ -59,8 +68,28 @@
         ToolbarButton {
             text: "rtf"
         }
-
-    }
+    }
+
+    QtObject {
+        id: priv
+        property int insertPosition
+        property var activeTransfer
+    }
+
+    ContentImportHint {
+        id: importHint
+        anchors.fill: parent
+        activeTransfer: root.activeTransfer
+    }
+    Connections {
+         target: priv.activeTransfer ? priv.activeTransfer : null
+         onStateChanged: {
+             if (priv.activeTransfer.state === ContentTransfer.Charged) {
+                 print("attaching", priv.activeTransfer.items[0].url.toString())
+                 note.attachFile(priv.insertPosition, priv.activeTransfer.items[0].url.toString())
+             }
+         }
+     }
 
     Column {
         anchors.fill: parent
@@ -99,7 +128,6 @@
 
             textFormat: TextEdit.RichText
             text: root.note ? root.note.richTextContent : ""
-
         }
     }
 }

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2013-12-15 01:57:25 +0000
+++ src/app/qml/ui/NotesPage.qml	2014-01-23 09:46:22 +0000
@@ -49,7 +49,7 @@
             text: "add note"
             iconName: "add"
             onTriggered: {
-                pagestack.push(Qt.resolvedUrl("EditNotePage.qml"));
+                NotesStore.createNote("Untitled");
             }
         }
     }
@@ -68,7 +68,7 @@
             title: model.title
             creationDate: model.created
             content: model.plaintextContent
-            resource: model.resources.length > 0 ? model.resources[0] : ""
+            resource: model.resourceUrls.length > 0 ? model.resourceUrls[0] : ""
 
             onClicked: {
                 pageStack.push(Qt.resolvedUrl("NotePage.qml"), {note: NotesStore.note(guid)})

=== modified file 'src/plugin/Evernote/CMakeLists.txt'
--- src/plugin/Evernote/CMakeLists.txt	2014-01-19 13:59:12 +0000
+++ src/plugin/Evernote/CMakeLists.txt	2014-01-23 09:46:22 +0000
@@ -11,6 +11,7 @@
     notebooks.cpp
     notes.cpp
     note.cpp
+    resource.cpp
     notebook.cpp
     jobs/fetchnotesjob.cpp
     jobs/fetchnotebooksjob.cpp

=== modified file 'src/plugin/Evernote/evernoteplugin.cpp'
--- src/plugin/Evernote/evernoteplugin.cpp	2013-12-15 01:57:25 +0000
+++ src/plugin/Evernote/evernoteplugin.cpp	2014-01-23 09:46:22 +0000
@@ -26,6 +26,7 @@
 #include "notes.h"
 #include "notebooks.h"
 #include "note.h"
+#include "resource.h"
 #include "notebook.h"
 #include "resourceimageprovider.h"
 
@@ -56,6 +57,7 @@
     qmlRegisterType<Notebooks>("Evernote", 0, 1, "Notebooks");
     qmlRegisterUncreatableType<Note>("Evernote", 0, 1, "Note", "Cannot create Notes in QML. Use NotesStore.createNote() instead.");
     qmlRegisterUncreatableType<Notebook>("Evernote", 0, 1, "Notebook", "Cannot create Notes in QML. Use NotesStore.createNotebook() instead.");
+    qmlRegisterUncreatableType<Resource>("Evernote", 0, 1, "Resource", "Cannot create Resources. Use Note.attachFile() instead.");
 }
 
 void EvernotePlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'src/plugin/Evernote/jobs/createnotejob.cpp'
--- src/plugin/Evernote/jobs/createnotejob.cpp	2013-11-28 00:39:33 +0000
+++ src/plugin/Evernote/jobs/createnotejob.cpp	2014-01-23 09:46:22 +0000
@@ -35,12 +35,16 @@
     evernote::edam::Note input;
     input.title = m_title.toStdString();
     input.__isset.title = true;
-    input.notebookGuid = m_notebookGuid.toStdString();
-    input.__isset.notebookGuid = true;
-    input.content = m_content.toStdString();
-    input.__isset.content = true;
-    input.contentLength = m_content.length();
-    input.__isset.contentLength = true;
+    if (!m_notebookGuid.isEmpty()) {
+        input.notebookGuid = m_notebookGuid.toStdString();
+        input.__isset.notebookGuid = true;
+    }
+    if (!m_content.isEmpty()) {
+        input.content = m_content.toStdString();
+        input.__isset.content = true;
+        input.contentLength = m_content.length();
+        input.__isset.contentLength = true;
+    }
 
     client()->createNote(m_resultNote, token().toStdString(), input);
 }

=== modified file 'src/plugin/Evernote/jobs/createnotejob.h'
--- src/plugin/Evernote/jobs/createnotejob.h	2013-11-29 20:58:04 +0000
+++ src/plugin/Evernote/jobs/createnotejob.h	2014-01-23 09:46:22 +0000
@@ -27,7 +27,7 @@
 {
     Q_OBJECT
 public:
-    explicit CreateNoteJob(const QString &title, const QString &notebookGuid, const QString &content, QObject *parent = 0);
+    explicit CreateNoteJob(const QString &title, const QString &notebookGuid = QString(), const QString &content = QString(), QObject *parent = 0);
 
 signals:
     void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, evernote::edam::Note note);

=== modified file 'src/plugin/Evernote/jobs/savenotejob.cpp'
--- src/plugin/Evernote/jobs/savenotejob.cpp	2013-12-14 22:38:57 +0000
+++ src/plugin/Evernote/jobs/savenotejob.cpp	2014-01-23 09:46:22 +0000
@@ -54,6 +54,33 @@
     note.attributes.reminderDoneTime = m_note->reminderDoneTime().toMSecsSinceEpoch();
     note.attributes.__isset.reminderDoneTime = true;
 
+    note.resources.clear();
+    foreach (Resource *resource, m_note->resources()) {
+        evernote::edam::Resource evResource;
+        evResource.noteGuid = m_note->guid().toStdString();
+        evResource.__isset.noteGuid = true;
+        evResource.mime = resource->type().toStdString();
+        evResource.__isset.mime = true;
+
+        evResource.data.bodyHash = resource->hash().toStdString();
+        evResource.data.__isset.bodyHash = true;
+
+        QByteArray data = resource->data();
+        evResource.data.body.assign(data.data(), data.length());
+        evResource.data.__isset.body = true;
+
+        evResource.data.size = data.length();
+        evResource.data.__isset.size = true;
+        evResource.__isset.data = true;
+
+        evResource.attributes.fileName = resource->fileName().toStdString();
+        evResource.attributes.__isset.fileName = true;
+        evResource.__isset.attributes = true;
+
+        note.resources.push_back(evResource);
+    }
+    note.__isset.resources = true;
+
     client()->updateNote(m_resultNote, token().toStdString(), note);
 }
 

=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2013-12-18 22:35:03 +0000
+++ src/plugin/Evernote/note.cpp	2014-01-23 09:46:22 +0000
@@ -27,6 +27,8 @@
 #include <QUrlQuery>
 #include <QStandardPaths>
 #include <QDebug>
+#include <QCryptographicHash>
+#include <QFile>
 
 Note::Note(const QString &guid, const QDateTime &created, QObject *parent) :
     QObject(parent),
@@ -36,6 +38,11 @@
 {
 }
 
+Note::~Note()
+{
+    qDeleteAll(m_resources.values());
+}
+
 QString Note::guid() const
 {
     return m_guid;
@@ -189,11 +196,16 @@
     }
 }
 
-QStringList Note::resources() const
+QList<Resource*> Note::resources() const
+{
+    return m_resources.values();
+}
+
+QStringList Note::resourceUrls() const
 {
     QList<QString> ret;
     foreach (const QString &hash, m_resources.keys()) {
-        QUrl url("image://resource/" + m_resourceTypes.value(hash));
+        QUrl url("image://resource/" + m_resources.value(hash)->type());
         QUrlQuery arguments;
         arguments.addQueryItem("noteGuid", m_guid);
         arguments.addQueryItem("hash", hash);
@@ -203,24 +215,24 @@
     return ret;
 }
 
-QImage Note::resource(const QString &hash)
+Resource* Note::resource(const QString &hash)
 {
     return m_resources.value(hash);
 }
 
-QString Note::resourceName(const QString &hash)
+
+Resource* Note::addResource(const QByteArray &data, const QString &hash, const QString &fileName, const QString &type)
 {
-    return m_resourceNames.value(hash);
+    Resource *resource = new Resource(data, hash, fileName, type, this);
+    m_resources.insert(hash, resource);
+    return resource;
 }
 
-void Note::addResource(const QString &hash, const QString &fileName, const QString &type, const QImage &image)
+Resource *Note::addResource(const QString &fileName)
 {
-    image.save(QStandardPaths::standardLocations(QStandardPaths::CacheLocation).first() + "/" + hash + "." + type.split('/').last());
-    if (!image.isNull()) {
-        m_resources.insert(hash, image);
-    }
-    m_resourceTypes.insert(hash, type);
-    m_resourceNames.insert(hash, fileName);
+    Resource *resource = new Resource(fileName);
+    m_resources.insert(resource->hash(), resource);
+    return resource;
 }
 
 void Note::markTodo(const QString &todoId, bool checked)
@@ -228,6 +240,13 @@
     m_content.markTodo(todoId, checked);
 }
 
+void Note::attachFile(int position, const QUrl &fileName)
+{
+    Resource *resource = addResource(fileName.path());
+    m_content.attachFile(position, fileName.path(), resource->hash(), resource->type());
+    emit contentChanged();
+}
+
 Note *Note::clone()
 {
     Note *note = new Note(m_guid, m_created);
@@ -238,6 +257,10 @@
     note->setReminderTime(m_reminderTime);
     note->setReminderDoneTime(m_reminderDoneTime);
     note->setIsSearchResult(m_isSearchResult);
+    foreach (Resource *resource, m_resources) {
+        note->addResource(resource->data(), resource->hash(), resource->fileName(), resource->type());
+    }
+
     return note;
 }
 

=== modified file 'src/plugin/Evernote/note.h'
--- src/plugin/Evernote/note.h	2014-01-10 12:00:26 +0000
+++ src/plugin/Evernote/note.h	2014-01-23 09:46:22 +0000
@@ -22,6 +22,7 @@
 #define NOTE_H
 
 #include "utils/enmldocument.h"
+#include "resource.h"
 
 #include <QObject>
 #include <QDateTime>
@@ -41,7 +42,7 @@
     Q_PROPERTY(QString richTextContent READ richTextContent WRITE setRichTextContent NOTIFY contentChanged)
     Q_PROPERTY(QString enmlContent READ enmlContent WRITE setEnmlContent NOTIFY contentChanged)
     Q_PROPERTY(QString plaintextContent READ plaintextContent NOTIFY contentChanged)
-    Q_PROPERTY(QList<QString> resources READ resources NOTIFY contentChanged)
+    Q_PROPERTY(QStringList resourceUrls READ resourceUrls NOTIFY contentChanged)
     Q_PROPERTY(bool reminder READ reminder WRITE setReminder NOTIFY reminderChanged)
     Q_PROPERTY(QDateTime reminderTime READ reminderTime WRITE setReminderTime NOTIFY reminderTimeChanged)
     Q_PROPERTY(bool reminderDone READ reminderDone WRITE setReminderDone NOTIFY reminderDoneChanged)
@@ -51,6 +52,7 @@
 
 public:
     explicit Note(const QString &guid, const QDateTime &created, QObject *parent = 0);
+    ~Note();
 
     QString guid() const;
 
@@ -96,12 +98,14 @@
     bool isSearchResult() const;
     void setIsSearchResult(bool isSearchResult);
 
-    QStringList resources() const;
-    QImage resource(const QString &hash);
-    QString resourceName(const QString &hash);
-    void addResource(const QString &hash, const QString &fileName, const QString &type, const QImage &image = QImage());
+    QStringList resourceUrls() const;
+    Resource* resource(const QString &hash);
+    QList<Resource*> resources() const;
+    Resource *addResource(const QByteArray &data, const QString &hash, const QString &fileName, const QString &type);
+    Resource *addResource(const QString &fileName);
 
     Q_INVOKABLE void markTodo(const QString &todoId, bool checked);
+    Q_INVOKABLE void attachFile(int position, const QUrl &fileName);
 
     Note* clone();
 
@@ -128,9 +132,7 @@
     QDateTime m_reminderTime;
     QDateTime m_reminderDoneTime;
     bool m_isSearchResult;
-    QHash<QString, QImage> m_resources;
-    QHash<QString, QString> m_resourceTypes;
-    QHash<QString, QString> m_resourceNames;
+    QHash<QString, Resource*> m_resources;
 };
 
 #endif // NOTE_H

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2013-12-18 22:35:03 +0000
+++ src/plugin/Evernote/notesstore.cpp	2014-01-23 09:46:22 +0000
@@ -93,8 +93,8 @@
         return m_notes.at(index.row())->richTextContent();
     case RolePlaintextContent:
         return m_notes.at(index.row())->plaintextContent();
-    case RoleResources:
-        return m_notes.at(index.row())->resources();
+    case RoleResourceUrls:
+        return m_notes.at(index.row())->resourceUrls();
     }
     return QVariant();
 }
@@ -114,7 +114,7 @@
     roles.insert(RoleRichTextContent, "richTextContent");
     roles.insert(RoleHtmlContent, "htmlContent");
     roles.insert(RolePlaintextContent, "plaintextContent");
-    roles.insert(RoleResources, "resources");
+    roles.insert(RoleResourceUrls, "resourceUrls");
     return roles;
 }
 
@@ -235,12 +235,8 @@
         QString fileName = QString::fromStdString(resource.attributes.fileName);
         QString mime = QString::fromStdString(resource.mime);
 
-        if (mime.startsWith("image/")) {
-            QImage image = QImage::fromData((const uchar*)resource.data.body.data(), resource.data.size);
-            note->addResource(hash, fileName, mime, image);
-        } else {
-            note->addResource(hash, fileName, mime);
-        }
+        QByteArray resourceData = QByteArray(resource.data.body.data(), resource.data.size);
+        note->addResource(resourceData, hash, fileName, mime);
     }
 
     note->setEnmlContent(QString::fromStdString(result.content));
@@ -324,6 +320,7 @@
     endInsertRows();
 
     emit noteAdded(note->guid(), note->notebookGuid());
+    emit noteCreated(note->guid(), note->notebookGuid());
 }
 
 void NotesStore::saveNote(const QString &guid)

=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2014-01-10 12:00:26 +0000
+++ src/plugin/Evernote/notesstore.h	2014-01-23 09:46:22 +0000
@@ -63,7 +63,7 @@
         RoleHtmlContent,
         RoleRichTextContent,
         RolePlaintextContent,
-        RoleResources
+        RoleResourceUrls
     };
 
     ~NotesStore();
@@ -77,7 +77,7 @@
     QList<Note*> notes() const;
 
     Q_INVOKABLE Note* note(const QString &guid);
-    Q_INVOKABLE void createNote(const QString &title, const QString &notebookGuid, const QString &richTextContent);
+    Q_INVOKABLE void createNote(const QString &title, const QString &notebookGuid = QString(), const QString &richTextContent = QString());
     void createNote(const QString &title, const QString &notebookGuid, const EnmlDocument &content);
     Q_INVOKABLE void saveNote(const QString &guid);
     Q_INVOKABLE void deleteNote(const QString &guid);
@@ -96,6 +96,7 @@
 signals:
     void tokenChanged();
 
+    void noteCreated(const QString &guid, const QString &notebookGuid);
     void noteAdded(const QString &guid, const QString &notebookGuid);
     void noteChanged(const QString &guid, const QString &notebookGuid);
     void noteRemoved(const QString &guid, const QString &notebookGuid);

=== added file 'src/plugin/Evernote/resource.cpp'
--- src/plugin/Evernote/resource.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/resource.cpp	2014-01-23 09:46:22 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app 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; version 3.
+ *
+ * reminders-app 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/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#include "resource.h"
+
+#include <QFile>
+#include <QStandardPaths>
+#include <QDebug>
+#include <QCryptographicHash>
+
+Resource::Resource(const QByteArray &data, const QString &hash, const QString &fileName, const QString &type, QObject *parent):
+    m_hash(hash),
+    m_fileName(fileName),
+    m_type(type)
+{
+
+    m_filePath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).first() + "/" + hash + "." + type.split('/').last();
+
+    QFile file(m_filePath);
+    if (!file.exists()) {
+
+        if (!file.open(QFile::WriteOnly)) {
+            qWarning() << "error writing file" << m_filePath;
+            return;
+        }
+        file.write(data);
+        file.close();
+    }
+}
+
+Resource::Resource(const QString &path, QObject *parent):
+    m_filePath(path)
+{
+    QFile file(path);
+    if (!file.open(QFile::ReadOnly)) {
+        qWarning() << "Cannot open file for reading...";
+        return;
+    }
+
+    QByteArray fileContent = file.readAll();
+    m_hash = QCryptographicHash::hash(fileContent, QCryptographicHash::Md5).toHex();
+
+    m_fileName = path.split('/').last();
+    if (m_fileName.endsWith(".png")) {
+        m_type = "image/png";
+    } else if (m_fileName.endsWith(".jpg") || m_fileName.endsWith(".jpeg")) {
+        m_type = "image/jpeg";
+    } else {
+        qWarning() << "cannot determine mime type of file" << m_fileName;
+    }
+}
+
+QString Resource::hash() const
+{
+    return m_hash;
+}
+
+QString Resource::type() const
+{
+    return m_type;
+}
+
+QString Resource::fileName() const
+{
+    return m_fileName;
+}
+
+QByteArray Resource::data() const
+{
+    QFile file(m_filePath);
+    if (file.open(QFile::ReadOnly)) {
+        return file.readAll();
+    }
+    return QByteArray();
+}

=== added file 'src/plugin/Evernote/resource.h'
--- src/plugin/Evernote/resource.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/resource.h	2014-01-23 09:46:22 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app 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; version 3.
+ *
+ * reminders-app 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/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#ifndef RESOURCE_H
+#define RESOURCE_H
+
+#include <QObject>
+#include <QString>
+#include <QImage>
+
+class Resource: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QByteArray data READ data CONSTANT)
+    Q_PROPERTY(QString hash READ hash CONSTANT)
+    Q_PROPERTY(QString fileName READ fileName CONSTANT)
+    Q_PROPERTY(QString type READ type CONSTANT)
+
+public:
+    Resource(const QString &path, QObject *parent = 0);
+    Resource(const QByteArray &data, const QString &hash, const QString &fileName, const QString &type, QObject *parent = 0);
+
+    QByteArray data() const;
+    QString hash() const;
+    QString fileName() const;
+    QString type() const;
+
+private:
+    QString m_hash;
+    QString m_fileName;
+    QString m_filePath;
+    QString m_type;
+};
+
+#endif

=== modified file 'src/plugin/Evernote/resourceimageprovider.cpp'
--- src/plugin/Evernote/resourceimageprovider.cpp	2013-12-18 22:35:03 +0000
+++ src/plugin/Evernote/resourceimageprovider.cpp	2014-01-23 09:46:22 +0000
@@ -26,7 +26,7 @@
 
     QImage image;
     if (mediaType.startsWith("image")) {
-        image = NotesStore::instance()->note(noteGuid)->resource(resourceHash);
+        image = QImage::fromData(NotesStore::instance()->note(noteGuid)->resource(resourceHash)->data());
     } else if (mediaType.startsWith("audio")) {
         image.load("/usr/share/icons/ubuntu-mobile/actions/scalable/media-playback-start.svg");
     } else {

=== modified file 'src/plugin/Evernote/utils/enmldocument.cpp'
--- src/plugin/Evernote/utils/enmldocument.cpp	2014-01-10 12:00:26 +0000
+++ src/plugin/Evernote/utils/enmldocument.cpp	2014-01-23 09:46:22 +0000
@@ -156,7 +156,7 @@
                     } else if (type == TypeHtml) {
                         QString imagePath = "file:///usr/share/icons/ubuntu-mobile/actions/scalable/media-playback-start.svg";
                         writer.writeAttribute("src", imagePath);
-                        writer.writeCharacters(NotesStore::instance()->note(noteGuid)->resourceName(hash));
+                        writer.writeCharacters(NotesStore::instance()->note(noteGuid)->resource(hash)->fileName());
                     }
                 } else {
                     if (type == TypeRichText) {
@@ -169,7 +169,7 @@
                     } else if (type == TypeHtml) {
                         QString imagePath = "file:///usr/share/icons/ubuntu-mobile/actions/scalable/help.svg";
                         writer.writeAttribute("src", imagePath);
-                        writer.writeCharacters(NotesStore::instance()->note(noteGuid)->resourceName(hash));
+                        writer.writeCharacters(NotesStore::instance()->note(noteGuid)->resource(hash)->fileName());
                     }
                 }
             }
@@ -234,16 +234,22 @@
     return html;
 }
 
-void EnmlDocument::setRichText(const QString &html)
+void EnmlDocument::setRichText(const QString &richText)
 {
     // output
     m_enml.clear();
+
     QXmlStreamWriter writer(&m_enml);
     writer.writeStartDocument();
     writer.writeDTD("<!DOCTYPE en-note SYSTEM \"http://xml.evernote.com/pub/enml2.dtd\">");
 
+    if (richText.isEmpty()) {
+        writer.writeStartElement("en-note");
+        writer.writeEndElement();
+    }
+
     // input
-    QXmlStreamReader reader(html);
+    QXmlStreamReader reader(richText);
 
     // state
     bool isBody = false;
@@ -363,6 +369,48 @@
     m_enml = output;
 }
 
+void EnmlDocument::attachFile(int position, const QString &file, const QString &hash, const QString &type)
+{
+    QXmlStreamReader reader(m_enml);
+
+    QString output;
+    QXmlStreamWriter writer(&output);
+    writer.writeStartDocument();
+    writer.writeDTD("<!DOCTYPE en-note SYSTEM \"http://xml.evernote.com/pub/enml2.dtd\">");
+
+    int textPos = 0;
+
+    while (!reader.atEnd() && !reader.hasError()) {
+        QXmlStreamReader::TokenType token = reader.readNext();
+
+        if (token == QXmlStreamReader::StartElement) {
+            writer.writeStartElement(reader.name().toString());
+            writer.writeAttributes(reader.attributes());
+        }
+
+        if (token == QXmlStreamReader::Characters) {
+            QString textString = reader.text().toString();
+            if (textPos <= position && textPos + textString.length() > position) {
+                writer.writeCharacters(textString.left(position - textPos));
+
+                writer.writeStartElement("en-media");
+                writer.writeAttribute("hash", hash);
+                writer.writeAttribute("type", type);
+                writer.writeEndElement();
+
+                writer.writeCharacters(textString.right(textString.length() - (position - textPos)));
+            } else {
+                writer.writeCharacters(reader.text().toString());
+            }
+            textPos += textString.length();
+        }
+        if (token == QXmlStreamReader::EndElement) {
+            writer.writeEndElement();
+        }
+    }
+    m_enml = output;
+}
+
 QString EnmlDocument::toPlaintext() const
 {
     // output

=== modified file 'src/plugin/Evernote/utils/enmldocument.h'
--- src/plugin/Evernote/utils/enmldocument.h	2014-01-10 12:00:26 +0000
+++ src/plugin/Evernote/utils/enmldocument.h	2014-01-23 09:46:22 +0000
@@ -38,6 +38,9 @@
 
     void setRichText(const QString &richText);
 
+    // Will insert the file at position in the plaintext string
+    void attachFile(int position, const QString &file, const QString &hash, const QString &type);
+
     void markTodo(const QString &todoId, bool checked);
 
 private:
@@ -47,7 +50,6 @@
     };
 
     QString convert(const QString &noteGuid, Type type) const;
-
 private:
     QString m_enml;