Merge lp:~mzanetti/reminders-app/create-edit-delete-notes into lp:reminders-app

[Michael Zanetti]

Adds support creating, editing and deleting notes.

Adds support creating, editing and deleting notes. Still a bit experimental. Need to figure a way to deal with the doctype.

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

FAILED: Continuous integration, rev:12
http://91.189.93.70:8080/job/reminders-app-ci/13/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/235/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-raring-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/13

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:12
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mzanetti/reminders-app/create-edit-delete-notes/+merge/196500/+edit-commit-message

http://91.189.93.70:8080/job/reminders-app-ci/14/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/236/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-raring-amd64-ci/14
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/14
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/14

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:12
http://91.189.93.70:8080/job/reminders-app-ci/23/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/291
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-raring-amd64-ci/23
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/23
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/23

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Works well here.

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'src/app/qml/ui/NotePage.qml'
--- src/app/qml/ui/NotePage.qml	2013-11-25 09:14:33 +0000
+++ src/app/qml/ui/NotePage.qml	2013-11-25 09:14:33 +0000
@@ -6,11 +6,30 @@
     title: note.title
     property var note
 
-    TextArea {
-        id: noteTextArea
+    Column {
         anchors.fill: parent
-        textFormat: TextEdit.RichText
-        text: note.content
+        spacing: units.gu(1)
+        Button {
+            width: parent.width
+            text: "save"
+            onClicked: {
+                print("timer triggered")
+                var content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE en-note SYSTEM \"http://xml.evernote.com/pub/enml2.dtd\"><en-note><div><br clear=\"none\"/>"
+                content = content + noteTextArea.getText(0, noteTextArea.length)
+                content = content + "<br clear=\"none\"/></div><div><br clear=\"none\"/></div></en-note>"
+                note.content = content
+                note.save();
+            }
+        }
+
+        TextArea {
+            id: noteTextArea
+            anchors { left: parent.left; right: parent.right }
+            height: parent.height - y
+
+            textFormat: TextEdit.RichText
+            text: note.content
+        }
     }
 }
 
 
=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2013-11-25 09:14:33 +0000
+++ src/app/qml/ui/NotesPage.qml	2013-11-25 09:14:33 +0000
@@ -8,6 +8,27 @@
 
     property alias filter: notes.filterNotebookGuid
 
+    onActiveChanged: {
+        if (active) {
+            print("refreshing notes")
+            notes.refresh();
+        }
+    }
+
+    // Just for testing
+    tools: ToolbarItems {
+        ToolbarButton {
+            text: "add note"
+            enabled: notes.filterNotebookGuid.length > 0
+            onTriggered: {
+                var content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE en-note SYSTEM \"http://xml.evernote.com/pub/enml2.dtd\"><en-note><div><br clear=\"none\"/>"
+                content = content + "fobar"
+                content = content + "<br clear=\"none\"/></div><div><br clear=\"none\"/></div></en-note>"
+                NotesStore.createNote("Untitled", notes.filterNotebookGuid, content);
+            }
+        }
+    }
+
     Notes {
         id: notes
     }
@@ -22,6 +43,10 @@
             onClicked: {
                 pageStack.push(Qt.resolvedUrl("NotePage.qml"), {note: notes.note(guid)})
             }
+
+            onPressAndHold: {
+                notes.note(guid).remove();
+            }
         }
     }
 }
 
=== modified file 'src/plugin/Evernote/Evernote.pro'
--- src/plugin/Evernote/Evernote.pro	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/Evernote.pro	2013-11-25 09:14:33 +0000
@@ -16,9 +16,13 @@
     notes.cpp \
     note.cpp \
     notebook.cpp \
-    fetchnotesjob.cpp \
-    fetchnotebooksjob.cpp \
-    fetchnotejob.cpp
+    jobs/fetchnotesjob.cpp \
+    jobs/fetchnotebooksjob.cpp \
+    jobs/fetchnotejob.cpp \
+    jobs/createnotejob.cpp \
+    jobs/evernotejob.cpp \
+    jobs/savenotejob.cpp \
+    jobs/deletenotejob.cpp
 
 HEADERS += evernoteplugin.h \
     notesstore.h \
@@ -27,9 +31,13 @@
     notes.h \
     note.h \
     notebook.h \
-    fetchnotesjob.h \
-    fetchnotebooksjob.h \
-    fetchnotejob.h
+    jobs/fetchnotesjob.h \
+    jobs/fetchnotebooksjob.h \
+    jobs/fetchnotejob.h \
+    jobs/createnotejob.h \
+    jobs/evernotejob.h \
+    jobs/savenotejob.h \
+    jobs/deletenotejob.h
 
 message(building in $$OUT_PWD)
 LIBS += -L$$OUT_PWD/../../../3rdParty/evernote-sdk-cpp/ -L$$OUT_PWD/../../../3rdParty/libthrift/ -levernote-sdk-cpp -llibthrift
 
=== added directory 'src/plugin/Evernote/jobs'
=== added file 'src/plugin/Evernote/jobs/createnotejob.cpp'
--- src/plugin/Evernote/jobs/createnotejob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/createnotejob.cpp	2013-11-25 09:14:33 +0000
@@ -0,0 +1,37 @@
+#include "createnotejob.h"
+
+#include <QDebug>
+
+CreateNoteJob::CreateNoteJob(Note *note, QObject *parent) :
+    EvernoteJob(parent),
+    m_note(note)
+{
+}
+
+void CreateNoteJob::run()
+{
+    NotesStore::ErrorCode errorCode = NotesStore::ErrorCodeNoError;
+
+    try {
+        evernote::edam::Note input;
+        input.title = m_note->title().toStdString();
+        input.__isset.title = true;
+        input.notebookGuid = m_note->notebookGuid().toStdString();
+        input.__isset.notebookGuid = true;
+        input.content = m_note->content().toStdString();
+        input.__isset.content = true;
+        input.contentLength = m_note->content().length();
+        input.__isset.contentLength = true;
+
+        evernote::edam::Note result;
+        client()->createNote(result, token().toStdString(), input);
+
+        m_note->setGuid(QString::fromStdString(result.guid));
+
+    } catch(evernote::edam::EDAMUserException e) {
+        errorCode = NotesStore::ErrorCodeUserException;
+    } catch(evernote::edam::EDAMSystemException) {
+        errorCode = NotesStore::ErrorCodeSystemException;
+    }
+    emit resultReady(errorCode, m_note);
+}
 
=== added file 'src/plugin/Evernote/jobs/createnotejob.h'
--- src/plugin/Evernote/jobs/createnotejob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/createnotejob.h	2013-11-25 09:14:33 +0000
@@ -0,0 +1,22 @@
+#ifndef CREATENOTEJOB_H
+#define CREATENOTEJOB_H
+
+#include "evernotejob.h"
+#include "note.h"
+
+class CreateNoteJob : public EvernoteJob
+{
+    Q_OBJECT
+public:
+    explicit CreateNoteJob(Note *note, QObject *parent = 0);
+
+    void run();
+
+signals:
+    void resultReady(NotesStore::ErrorCode errorCode, Note *note);
+
+private:
+    Note *m_note;
+};
+
+#endif // CREATENOTEJOB_H
 
=== added file 'src/plugin/Evernote/jobs/deletenotejob.cpp'
--- src/plugin/Evernote/jobs/deletenotejob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/deletenotejob.cpp	2013-11-25 09:14:33 +0000
@@ -0,0 +1,18 @@
+#include "deletenotejob.h"
+
+DeleteNoteJob::DeleteNoteJob(const QString &guid, QObject *parent):
+    EvernoteJob(parent),
+    m_guid(guid)
+{
+}
+
+void DeleteNoteJob::run()
+{
+    NotesStore::ErrorCode errorCode = NotesStore::ErrorCodeNoError;
+    try {
+        client()->deleteNote(token().toStdString(), m_guid.toStdString());
+    } catch(...) {
+        catchTransportException();
+    }
+    emit resultReady(errorCode, m_guid);
+}
 
=== added file 'src/plugin/Evernote/jobs/deletenotejob.h'
--- src/plugin/Evernote/jobs/deletenotejob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/deletenotejob.h	2013-11-25 09:14:33 +0000
@@ -0,0 +1,21 @@
+#ifndef DELETENOTEJOB_H
+#define DELETENOTEJOB_H
+
+#include "evernotejob.h"
+
+class DeleteNoteJob : public EvernoteJob
+{
+    Q_OBJECT
+public:
+    DeleteNoteJob(const QString &guid, QObject *parent = 0);
+
+    void run();
+
+signals:
+    void resultReady(NotesStore::ErrorCode errorCode, const QString &guid);
+
+private:
+    QString m_guid;
+};
+
+#endif // DELETENOTEJOB_H
 
=== added file 'src/plugin/Evernote/jobs/evernotejob.cpp'
--- src/plugin/Evernote/jobs/evernotejob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/evernotejob.cpp	2013-11-25 09:14:33 +0000
@@ -0,0 +1,49 @@
+#include "evernotejob.h"
+
+// Thrift
+#include <arpa/inet.h> // seems thrift forgot this one
+#include <protocol/TBinaryProtocol.h>
+#include <transport/THttpClient.h>
+#include <transport/TSSLSocket.h>
+#include <Thrift.h>
+
+#include <QDebug>
+
+using namespace apache::thrift;
+using namespace apache::thrift::protocol;
+using namespace apache::thrift::transport;
+
+EvernoteJob::EvernoteJob(QObject *parent) :
+    QThread(parent),
+    m_token(NotesStore::instance()->token())
+{
+    connect(this, &EvernoteJob::finished, this, &EvernoteJob::deleteLater);
+}
+
+EvernoteJob::~EvernoteJob()
+{
+
+}
+
+evernote::edam::NoteStoreClient *EvernoteJob::client()
+{
+    return NotesStore::instance()->m_client;
+}
+
+QString EvernoteJob::token()
+{
+    return m_token;
+}
+
+void EvernoteJob::catchTransportException()
+{
+    try {
+        // this function is meant to be called from a catch block
+        // rethrow the exception to catch it again
+        throw;
+    } catch (const TTransportException & e) {
+        qDebug() <<  e.what();
+    } catch (const TException & e) {
+        qDebug() <<  e.what();
+    }
+}
 
=== added file 'src/plugin/Evernote/jobs/evernotejob.h'
--- src/plugin/Evernote/jobs/evernotejob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/evernotejob.h	2013-11-25 09:14:33 +0000
@@ -0,0 +1,30 @@
+#ifndef EVERNOTEJOB_H
+#define EVERNOTEJOB_H
+
+#include "notesstore.h"
+
+// Evernote SDK
+#include <NoteStore.h>
+#include <NoteStore_constants.h>
+#include <Errors_types.h>
+
+#include <QThread>
+
+class EvernoteJob : public QThread
+{
+    Q_OBJECT
+public:
+    explicit EvernoteJob(QObject *parent = 0);
+    virtual ~EvernoteJob();
+
+protected:
+    evernote::edam::NoteStoreClient* client();
+    QString token();
+
+    void catchTransportException();
+
+private:
+    QString m_token;
+};
+
+#endif // EVERNOTEJOB_H
 
=== renamed file 'src/plugin/Evernote/fetchnotebooksjob.cpp' => 'src/plugin/Evernote/jobs/fetchnotebooksjob.cpp'
--- src/plugin/Evernote/fetchnotebooksjob.cpp	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/jobs/fetchnotebooksjob.cpp	2013-11-25 09:14:33 +0000
@@ -2,10 +2,8 @@
 
 #include <QDebug>
 
-FetchNotebooksJob::FetchNotebooksJob(evernote::edam::NoteStoreClient *client, const QString &token, QObject *parent) :
-    QThread(parent),
-    m_client(client),
-    m_token(token)
+FetchNotebooksJob::FetchNotebooksJob(QObject *parent) :
+    EvernoteJob(parent)
 {
 }
 
@@ -15,7 +13,7 @@
     NotesStore::ErrorCode errorCode = NotesStore::ErrorCodeNoError;
     std::vector<evernote::edam::Notebook> results;
     try {
-        m_client->listNotebooks(results, m_token.toStdString());
+        client()->listNotebooks(results, token().toStdString());
     } catch(evernote::edam::EDAMUserException) {
         errorCode = NotesStore::ErrorCodeUserException;
     } catch(evernote::edam::EDAMSystemException) {
 
=== renamed file 'src/plugin/Evernote/fetchnotebooksjob.h' => 'src/plugin/Evernote/jobs/fetchnotebooksjob.h'
--- src/plugin/Evernote/fetchnotebooksjob.h	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/jobs/fetchnotebooksjob.h	2013-11-25 09:14:33 +0000
@@ -1,29 +1,18 @@
 #ifndef FETCHNOTEBOOKSJOB_H
 #define FETCHNOTEBOOKSJOB_H
 
-#include "notesstore.h"
-
-// Evernote SDK
-#include <NoteStore.h>
-#include <NoteStore_constants.h>
-#include <Errors_types.h>
-
-#include <QThread>
-
-class FetchNotebooksJob : public QThread
+#include "evernotejob.h"
+
+class FetchNotebooksJob : public EvernoteJob
 {
     Q_OBJECT
 public:
-    explicit FetchNotebooksJob(evernote::edam::NoteStoreClient *client, const QString &token, QObject *parent = 0);
+    explicit FetchNotebooksJob(QObject *parent = 0);
 
     void run();
 
 signals:
     void resultReady(NotesStore::ErrorCode errorCode, const std::vector<evernote::edam::Notebook> &results);
-
-private:
-    evernote::edam::NoteStoreClient *m_client;
-    QString m_token;
 };
 
 #endif // FETCHNOTEBOOKSJOB_H
 
=== renamed file 'src/plugin/Evernote/fetchnotejob.cpp' => 'src/plugin/Evernote/jobs/fetchnotejob.cpp'
--- src/plugin/Evernote/fetchnotejob.cpp	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/jobs/fetchnotejob.cpp	2013-11-25 09:14:33 +0000
@@ -1,9 +1,7 @@
 #include "fetchnotejob.h"
 
-FetchNoteJob::FetchNoteJob(evernote::edam::NoteStoreClient *client, const QString &token, const QString &guid, QObject *parent) :
-    QThread(parent),
-    m_client(client),
-    m_token(token),
+FetchNoteJob::FetchNoteJob(const QString &guid, QObject *parent) :
+    EvernoteJob(parent),
     m_guid(guid)
 {
 }
@@ -13,13 +11,16 @@
     NotesStore::ErrorCode errorCode = NotesStore::ErrorCodeNoError;
     evernote::edam::Note result;
     try {
-        m_client->getNote(result, m_token.toStdString(), m_guid.toStdString(), true, true, false, false);
-    } catch(evernote::edam::EDAMUserException) {
+        client()->getNote(result, token().toStdString(), m_guid.toStdString(), true, true, false, false);
+    } catch (evernote::edam::EDAMUserException) {
         errorCode = NotesStore::ErrorCodeUserException;
-    } catch(evernote::edam::EDAMSystemException) {
+    } catch (evernote::edam::EDAMSystemException) {
         errorCode = NotesStore::ErrorCodeSystemException;
-    } catch(evernote::edam::EDAMNotFoundException) {
+    } catch (evernote::edam::EDAMNotFoundException) {
         errorCode = NotesStore::ErrorCodeNotFoundExcpetion;
+    } catch (...) {
+        catchTransportException();
+        errorCode = NotesStore::ErrorCodeConnectionLost;
     }
 
     emit resultReady(errorCode, result);
 
=== renamed file 'src/plugin/Evernote/fetchnotejob.h' => 'src/plugin/Evernote/jobs/fetchnotejob.h'
--- src/plugin/Evernote/fetchnotejob.h	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/jobs/fetchnotejob.h	2013-11-25 09:14:33 +0000
@@ -1,20 +1,13 @@
 #ifndef FETCHNOTEJOB_H
 #define FETCHNOTEJOB_H
 
-#include "notesstore.h"
-
-// Evernote SDK
-#include <NoteStore.h>
-#include <NoteStore_constants.h>
-#include <Errors_types.h>
-
-#include <QThread>
-
-class FetchNoteJob : public QThread
+#include "evernotejob.h"
+
+class FetchNoteJob : public EvernoteJob
 {
     Q_OBJECT
 public:
-    explicit FetchNoteJob(evernote::edam::NoteStoreClient *client, const QString &token, const QString &guid, QObject *parent = 0);
+    explicit FetchNoteJob(const QString &guid, QObject *parent = 0);
 
     void run();
 signals:
 
=== renamed file 'src/plugin/Evernote/fetchnotesjob.cpp' => 'src/plugin/Evernote/jobs/fetchnotesjob.cpp'
--- src/plugin/Evernote/fetchnotesjob.cpp	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/jobs/fetchnotesjob.cpp	2013-11-25 09:14:33 +0000
@@ -4,12 +4,8 @@
 
 #include <QDebug>
 
-FetchNotesJob::FetchNotesJob(evernote::edam::NoteStoreClient *client,
-                             const QString &token,
-                             const QString &filterNotebookGuid, QObject *parent) :
-    QThread(parent),
-    m_client(client),
-    m_token(token),
+FetchNotesJob::FetchNotesJob( const QString &filterNotebookGuid, QObject *parent) :
+    EvernoteJob(parent),
     m_filterNotebookGuid(filterNotebookGuid)
 {
 }
@@ -36,7 +32,7 @@
     evernote::edam::NotesMetadataList results;
 
     try {
-        m_client->findNotesMetadata(results, m_token.toStdString(), filter, start, end, resultSpec);
+        client()->findNotesMetadata(results, token().toStdString(), filter, start, end, resultSpec);
     } catch(evernote::edam::EDAMUserException) {
         errorCode = NotesStore::ErrorCodeUserException;
     } catch(evernote::edam::EDAMSystemException) {
 
=== renamed file 'src/plugin/Evernote/fetchnotesjob.h' => 'src/plugin/Evernote/jobs/fetchnotesjob.h'
--- src/plugin/Evernote/fetchnotesjob.h	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/jobs/fetchnotesjob.h	2013-11-25 09:14:33 +0000
@@ -1,20 +1,13 @@
 #ifndef FETCHNOTESJOB_H
 #define FETCHNOTESJOB_H
 
-#include "notesstore.h"
-
-// Evernote SDK
-#include <NoteStore.h>
-#include <NoteStore_constants.h>
-#include <Errors_types.h>
-
-#include <QThread>
-
-class FetchNotesJob : public QThread
+#include "evernotejob.h"
+
+class FetchNotesJob : public EvernoteJob
 {
     Q_OBJECT
 public:
-    explicit FetchNotesJob(evernote::edam::NoteStoreClient *client, const QString &token, const QString &filterNotebookGuid, QObject *parent = 0);
+    explicit FetchNotesJob(const QString &filterNotebookGuid, QObject *parent = 0);
 
     void run();
 
@@ -22,8 +15,6 @@
     void resultReady(NotesStore::ErrorCode errorCode, const evernote::edam::NotesMetadataList &results);
 
 private:
-    evernote::edam::NoteStoreClient *m_client;
-    QString m_token;
     QString m_filterNotebookGuid;
 };
 
 
=== added file 'src/plugin/Evernote/jobs/savenotejob.cpp'
--- src/plugin/Evernote/jobs/savenotejob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/savenotejob.cpp	2013-11-25 09:14:33 +0000
@@ -0,0 +1,40 @@
+#include "savenotejob.h"
+#include "note.h"
+
+#include <QDebug>
+
+SaveNoteJob::SaveNoteJob(Note *note, QObject *parent) :
+    EvernoteJob(parent),
+    m_note(note)
+{
+}
+
+void SaveNoteJob::run()
+{
+    NotesStore::ErrorCode errorCode = NotesStore::ErrorCodeNoError;
+    try {
+        evernote::edam::Note note;
+        note.guid = m_note->guid().toStdString();
+        note.__isset.guid = true;
+        note.title = m_note->title().toStdString();
+        note.__isset.title = true;
+        note.notebookGuid = m_note->notebookGuid().toStdString();
+        note.__isset.notebookGuid = true;
+        note.content = m_note->content().toStdString();
+        note.__isset.content = true;
+        note.contentLength = m_note->content().length();
+
+        client()->updateNote(note, token().toStdString(), note);
+
+    } catch (evernote::edam::EDAMUserException e) {
+        errorCode = NotesStore::ErrorCodeUserException;
+        qDebug() << QString::fromStdString(e.parameter);
+    } catch (evernote::edam::EDAMSystemException) {
+        errorCode = NotesStore::ErrorCodeSystemException;
+    } catch (...) {
+        catchTransportException();
+        errorCode = NotesStore::ErrorCodeConnectionLost;
+    }
+
+    emit resultReady(errorCode, m_note);
+}
 
=== added file 'src/plugin/Evernote/jobs/savenotejob.h'
--- src/plugin/Evernote/jobs/savenotejob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/savenotejob.h	2013-11-25 09:14:33 +0000
@@ -0,0 +1,20 @@
+#ifndef SAVENOTEJOB_H
+#define SAVENOTEJOB_H
+
+#include "evernotejob.h"
+
+class SaveNoteJob : public EvernoteJob
+{
+    Q_OBJECT
+public:
+    explicit SaveNoteJob(Note *note, QObject *parent = 0);
+
+    void run();
+signals:
+    void resultReady(NotesStore::ErrorCode errorCode, Note *note);
+
+private:
+    Note *m_note;
+};
+
+#endif // SAVENOTEJOB_H
 
=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/note.cpp	2013-11-25 09:14:33 +0000
@@ -1,5 +1,7 @@
 #include "note.h"
 
+#include "notesstore.h"
+
 Note::Note(const QString &guid, QObject *parent) :
     QObject(parent),
     m_guid(guid)
@@ -11,6 +13,14 @@
     return m_guid;
 }
 
+void Note::setGuid(const QString &guid)
+{
+    if (m_guid == guid) {
+        m_guid = guid;
+        emit guidChanged();
+    }
+}
+
 QString Note::notebookGuid() const
 {
     return m_notebookGuid;
@@ -49,3 +59,13 @@
         emit contentChanged();
     }
 }
+
+void Note::save()
+{
+    NotesStore::instance()->saveNote(m_guid);
+}
+
+void Note::remove()
+{
+    NotesStore::instance()->deleteNote(m_guid);
+}
 
=== modified file 'src/plugin/Evernote/note.h'
--- src/plugin/Evernote/note.h	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/note.h	2013-11-25 09:14:33 +0000
@@ -7,14 +7,15 @@
 {
     Q_OBJECT
 
-    Q_PROPERTY(QString guid READ guid CONSTANT)
+    Q_PROPERTY(QString guid READ guid NOTIFY guidChanged)
     Q_PROPERTY(QString notebookGuid READ notebookGuid WRITE setNotebookGuid NOTIFY notebookGuidChanged)
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
     Q_PROPERTY(QString content READ content WRITE setContent NOTIFY contentChanged)
 public:
-    explicit Note(const QString &guid, QObject *parent = 0);
+    explicit Note(const QString &guid = QString(), QObject *parent = 0);
 
     QString guid() const;
+    void setGuid(const QString &guid);
 
     QString notebookGuid() const;
     void setNotebookGuid(const QString &notebookGuid);
@@ -25,7 +26,12 @@
     QString content() const;
     void setContent(const QString &content);
 
+public slots:
+    void save();
+    void remove();
+
 signals:
+    void guidChanged();
     void titleChanged();
     void notebookGuidChanged();
     void contentChanged();
 
=== modified file 'src/plugin/Evernote/notebooks.cpp'
--- src/plugin/Evernote/notebooks.cpp	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/notebooks.cpp	2013-11-25 09:14:33 +0000
@@ -41,7 +41,6 @@
 
 void Notebooks::refresh()
 {
-    qDebug() << "refreshing notebooks";
     NotesStore::instance()->refreshNotebooks();
 }
 
 
=== modified file 'src/plugin/Evernote/notes.cpp'
--- src/plugin/Evernote/notes.cpp	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/notes.cpp	2013-11-25 09:14:33 +0000
@@ -6,7 +6,9 @@
 Notes::Notes(QObject *parent) :
     QAbstractListModel(parent)
 {
-    connect(NotesStore::instance(), SIGNAL(noteAdded(const QString &)), SLOT(noteAdded(const QString &)));
+    connect(NotesStore::instance(), &NotesStore::noteAdded, this, &Notes::noteAdded);
+    connect(NotesStore::instance(), &NotesStore::noteRemoved, this, &Notes::noteRemoved);
+    connect(NotesStore::instance(), &NotesStore::noteChanged, this, &Notes::noteChanged);
 }
 
 QVariant Notes::data(const QModelIndex &index, int role) const
@@ -85,3 +87,13 @@
         emit dataChanged(index(row), index(row));
     }
 }
+
+void Notes::noteRemoved(const QString &guid)
+{
+    int index = m_list.indexOf(guid);
+    if (index >= 0) {
+        beginRemoveRows(QModelIndex(), index, index);
+        m_list.removeAt(index);
+        endRemoveRows();
+    }
+}
 
=== modified file 'src/plugin/Evernote/notes.h'
--- src/plugin/Evernote/notes.h	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/notes.h	2013-11-25 09:14:33 +0000
@@ -35,6 +35,7 @@
 private slots:
     void noteAdded(const QString &guid);
     void noteChanged(const QString &guid);
+    void noteRemoved(const QString &guid);
 
 signals:
     void filterNotebookGuidChanged();
 
=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/notesstore.cpp	2013-11-25 09:14:33 +0000
@@ -3,9 +3,12 @@
 #include "notebook.h"
 #include "note.h"
 
-#include "fetchnotesjob.h"
-#include "fetchnotebooksjob.h"
-#include "fetchnotejob.h"
+#include "jobs/fetchnotesjob.h"
+#include "jobs/fetchnotebooksjob.h"
+#include "jobs/fetchnotejob.h"
+#include "jobs/createnotejob.h"
+#include "jobs/savenotejob.h"
+#include "jobs/deletenotejob.h"
 
 // Thrift
 #include <arpa/inet.h> // seems thrift forgot this one
@@ -127,6 +130,23 @@
     return m_notes.value(guid);
 }
 
+void NotesStore::saveNote(const QString &guid)
+{
+    Note *note = m_notes.value(guid);
+    SaveNoteJob *job = new SaveNoteJob(note, this);
+    connect(job, &SaveNoteJob::resultReady, this, &NotesStore::saveNoteJobDone);
+    m_jobQueue.append(job);
+    startJobQueue();
+}
+
+void NotesStore::deleteNote(const QString &guid)
+{
+    DeleteNoteJob *job = new DeleteNoteJob(guid, this);
+    connect(job, &DeleteNoteJob::resultReady, this, &NotesStore::deleteNoteJobDone);
+    m_jobQueue.append(job);
+    startJobQueue();
+}
+
 QList<Notebook *> NotesStore::notebooks() const
 {
     return m_notebooks.values();
@@ -139,14 +159,14 @@
 
 void NotesStore::startJobQueue()
 {
-    if (m_requestQueue.isEmpty()) {
+    if (m_jobQueue.isEmpty()) {
         return;
     }
 
     if (m_currentJob) {
         return;
     }
-    m_currentJob = m_requestQueue.takeFirst();
+    m_currentJob = m_jobQueue.takeFirst();
     m_currentJob->start();
 }
 
@@ -163,11 +183,10 @@
         return;
     }
 
-    FetchNotesJob *job = new FetchNotesJob(m_client, m_token, filterNotebookGuid);
+    FetchNotesJob *job = new FetchNotesJob(filterNotebookGuid);
     connect(job, &FetchNotesJob::resultReady, this, &NotesStore::fetchNotesJobDone);
-    connect(job, &FetchNoteJob::finished, job, &FetchNotesJob::deleteLater);
 
-    m_requestQueue.append(job);
+    m_jobQueue.append(job);
     startJobQueue();
 }
 
@@ -183,7 +202,9 @@
         evernote::edam::NoteMetadata result = results.notes.at(i);
         Note *note = m_notes.value(QString::fromStdString(result.guid));
         if (note) {
-            qDebug() << "Received update for existing note";
+            note->setTitle(QString::fromStdString(result.title));
+            note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
+            emit noteChanged(note->guid());
         } else {
             note = new Note(QString::fromStdString(result.guid), this);
             note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
@@ -203,10 +224,9 @@
         return;
     }
 
-    FetchNoteJob *job = new FetchNoteJob(m_client, m_token, guid, this);
+    FetchNoteJob *job = new FetchNoteJob(guid, this);
     connect(job, &FetchNoteJob::resultReady, this, &NotesStore::fetchNoteJobDone);
-    connect(job, &FetchNoteJob::finished, job, &FetchNoteJob::deleteLater);
-    m_requestQueue.append(job);
+    m_jobQueue.append(job);
 
     startJobQueue();
 }
@@ -235,11 +255,10 @@
         return;
     }
 
-    FetchNotebooksJob *job = new FetchNotebooksJob(m_client, m_token);
+    FetchNotebooksJob *job = new FetchNotebooksJob();
     connect(job, &FetchNotebooksJob::resultReady, this, &NotesStore::fetchNotebooksJobDone);
-    connect(job, &FetchNotebooksJob::finished, job, &FetchNotebooksJob::deleteLater);
 
-    m_requestQueue.append(job);
+    m_jobQueue.append(job);
     startJobQueue();
 }
 
@@ -256,13 +275,61 @@
         Notebook *notebook = m_notebooks.value(QString::fromStdString(result.guid));
         if (notebook) {
             qDebug() << "got notebook update";
+            notebook->setName(QString::fromStdString(result.name));
+            emit notebookChanged(notebook->guid());
         } else {
             notebook = new Notebook(QString::fromStdString(result.guid), this);
             notebook->setName(QString::fromStdString(result.name));
             m_notebooks.insert(notebook->guid(), notebook);
             emit notebookAdded(notebook->guid());
+            qDebug() << "got new notebook" << notebook->guid();
         }
     }
 
     startNextJob();
 }
+
+void NotesStore::createNote(const QString &title, const QString &notebookGuid, const QString &content)
+{
+    Note *note = new Note();
+    note->setTitle(title);
+    note->setNotebookGuid(notebookGuid);
+    note->setContent(content);
+    CreateNoteJob *job = new CreateNoteJob(note);
+    connect(job, &CreateNoteJob::resultReady, this, &NotesStore::createNoteJobDone);
+
+    m_jobQueue.append(job);
+    startJobQueue();
+}
+
+void NotesStore::createNoteJobDone(NotesStore::ErrorCode errorCode, Note *note)
+{
+    if (errorCode != ErrorCodeNoError) {
+        qWarning() << "Error creating note:" << errorCodeToString(errorCode);
+        delete note;
+        startNextJob();
+        return;
+    }
+
+    m_notes.insert(note->guid(), note);
+    noteAdded(note->guid());
+    startNextJob();
+}
+
+void NotesStore::saveNoteJobDone(NotesStore::ErrorCode errorCode, Note *note)
+{
+    startNextJob();
+}
+
+void NotesStore::deleteNoteJobDone(NotesStore::ErrorCode errorCode, const QString &guid)
+{
+    if (errorCode != ErrorCodeNoError) {
+        qWarning() << "Cannot delete note:" << errorCodeToString(errorCode);
+        startNextJob();
+        return;
+    }
+    emit noteRemoved(guid);
+    m_notes.take(guid)->deleteLater();
+    startNextJob();
+}
+
 
=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2013-11-25 09:14:33 +0000
+++ src/plugin/Evernote/notesstore.h	2013-11-25 09:14:33 +0000
@@ -9,6 +9,8 @@
 #include <QObject>
 #include <QHash>
 
+class EvernoteJob;
+
 class Notebook;
 class Note;
 
@@ -17,14 +19,19 @@
     Q_OBJECT
     Q_PROPERTY(QString token READ token WRITE setToken NOTIFY tokenChanged)
 
+    friend class EvernoteJob;
+
 public:
     enum ErrorCode {
         ErrorCodeNoError,
         ErrorCodeUserException,
         ErrorCodeSystemException,
-        ErrorCodeNotFoundExcpetion
+        ErrorCodeNotFoundExcpetion,
+        ErrorCodeConnectionLost
     };
 
+    Q_INVOKABLE void createNote(const QString &title, const QString &notebookGuid, const QString &content);
+
     static NotesStore *instance();
     static QString errorCodeToString(ErrorCode errorCode);
 
@@ -35,6 +42,8 @@
 
     QList<Note*> notes() const;
     Note* note(const QString &guid);
+    void saveNote(const QString &guid);
+    void deleteNote(const QString &guid);
 
     QList<Notebook*> notebooks() const;
     Notebook* notebook(const QString &guid);
@@ -48,13 +57,18 @@
 
     void noteAdded(const QString &guid);
     void noteChanged(const QString &guid);
+    void noteRemoved(const QString &guid);
 
     void notebookAdded(const QString &guid);
+    void notebookChanged(const QString &guid);
 
 private slots:
     void fetchNotesJobDone(ErrorCode errorCode, const evernote::edam::NotesMetadataList &results);
     void fetchNotebooksJobDone(ErrorCode errorCode, const std::vector<evernote::edam::Notebook> &results);
     void fetchNoteJobDone(ErrorCode errorCode, const evernote::edam::Note &result);
+    void createNoteJobDone(ErrorCode errorCode, Note *note);
+    void saveNoteJobDone(ErrorCode errorCode, Note *note);
+    void deleteNoteJobDone(ErrorCode errorCode, const QString &guid);
 
     void startJobQueue();
     void startNextJob();
@@ -69,7 +83,7 @@
     QHash<QString, Notebook*> m_notebooks;
     QHash<QString, Note*> m_notes;
 
-    QList<QThread*> m_requestQueue;
+    QList<EvernoteJob*> m_jobQueue;
     QThread *m_currentJob;
 };