Merge lp:~mzanetti/reminders-app/get-username into lp:reminders-app

[Michael Zanetti]

implement initial userstore. split connection handling into EvernoteConnection

This implements the beginning of the UserStore. So far it has only one property "username" which is what we will need in OnlineAccounts.

I have moved the connection setup into a new class "EvernoteConnection" so some stuff can be shared between NotesStore and UserStore. The EvernoteConnection class now does the connection setup and the job queue handling. The base class for Jobs is split into NotesStoreJob and UserStoreJob taking care about selecting the proper connection.

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

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

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

review: Approve

=== modified file 'src/app/qml/reminders-app.qml'
--- src/app/qml/reminders-app.qml	2013-11-26 17:18:33 +0000
+++ src/app/qml/reminders-app.qml	2013-11-28 00:46:50 +0000
@@ -47,11 +47,18 @@
 
     Component.onCompleted: {
         pagestack.push(rootTabs)
-        if (NotesStore.token.length === 0) {
+        if (EvernoteConnection.token.length === 0) {
             pagestack.push(Qt.resolvedUrl("ui/AccountSelectorPage.qml"));
         }
     }
 
+    Connections {
+        target: UserStore
+        onUsernameChanged: {
+            print("Logged in as user:", UserStore.username)
+        }
+    }
+
     PageStack {
         id: pagestack
 

=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
--- src/app/qml/ui/AccountSelectorPage.qml	2013-11-26 17:18:33 +0000
+++ src/app/qml/ui/AccountSelectorPage.qml	2013-11-28 00:46:50 +0000
@@ -51,7 +51,7 @@
                         // Print the access token on the console
                         onAuthenticated: {
                             console.log("Access token is " + reply.AccessToken)
-                            NotesStore.token = reply.AccessToken;
+                            EvernoteConnection.token = reply.AccessToken;
                             pagestack.pop();
                         }
                         onAuthenticationError: { console.log("Authentication failed, code " + error.code) }

=== modified file 'src/plugin/Evernote/Evernote.pro'
--- src/plugin/Evernote/Evernote.pro	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/Evernote.pro	2013-11-28 00:46:50 +0000
@@ -23,7 +23,11 @@
     jobs/evernotejob.cpp \
     jobs/savenotejob.cpp \
     jobs/deletenotejob.cpp \
-    utils/html2enmlconverter.cpp
+    utils/html2enmlconverter.cpp \
+    evernoteconnection.cpp \
+    jobs/userstorejob.cpp \
+    jobs/notesstorejob.cpp \
+    jobs/fetchusernamejob.cpp
 
 HEADERS += evernoteplugin.h \
     notesstore.h \
@@ -39,7 +43,11 @@
     jobs/evernotejob.h \
     jobs/savenotejob.h \
     jobs/deletenotejob.h \
-    utils/html2enmlconverter.h
+    utils/html2enmlconverter.h \
+    evernoteconnection.h \
+    jobs/userstorejob.h \
+    jobs/notesstorejob.h \
+    jobs/fetchusernamejob.h
 
 message(building in $$OUT_PWD)
 LIBS += -L$$OUT_PWD/../../../3rdParty/evernote-sdk-cpp/ -L$$OUT_PWD/../../../3rdParty/libthrift/ -levernote-sdk-cpp -llibthrift -lssl -lcrypto

=== added file 'src/plugin/Evernote/evernoteconnection.cpp'
--- src/plugin/Evernote/evernoteconnection.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/evernoteconnection.cpp	2013-11-28 00:46:50 +0000
@@ -0,0 +1,190 @@
+/*
+ * 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 "evernoteconnection.h"
+#include "jobs/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>
+
+// Evernote SDK
+#include <NoteStore.h>
+#include <NoteStore_constants.h>
+#include <UserStore.h>
+#include <UserStore_constants.h>
+#include <Errors_types.h>
+
+#include <QDebug>
+
+using namespace apache::thrift;
+using namespace apache::thrift::protocol;
+using namespace apache::thrift::transport;
+
+EvernoteConnection* EvernoteConnection::s_instance = 0;
+
+// FIXME: need to populate this string from the system
+// The structure should be:
+// application/version; platform/version; [ device/version ]
+// E.g. "Evernote Windows/3.0.1; Windows/XP SP3"
+QString EDAM_CLIENT_NAME = QStringLiteral("Reminders/0.1; Ubuntu/13.10");
+QString EVERNOTE_HOST = QStringLiteral("sandbox.evernote.com");
+QString EDAM_USER_STORE_PATH = QStringLiteral("/edam/user");
+QString EDAM_NOTE_STORE_PATH = QStringLiteral("/edam/note");
+
+EvernoteConnection::EvernoteConnection(QObject *parent) :
+    QObject(parent),
+    m_currentJob(0),
+    m_useSSL(true)
+{
+    setupUserStore();
+    setupNotesStore();
+}
+
+bool EvernoteConnection::setupUserStore()
+{
+    bool versionOK = false;
+    try {
+        boost::shared_ptr<TSocket> socket;
+
+        if (m_useSSL) {
+            boost::shared_ptr<TSSLSocketFactory> sslSocketFactory(new TSSLSocketFactory());
+            socket = sslSocketFactory->createSocket(EVERNOTE_HOST.toStdString(), 443);
+            qDebug() << "created UserStore SSL socket";
+        } else {
+            // Create a non-secure socket
+            socket = boost::shared_ptr<TSocket> (new TSocket(EVERNOTE_HOST.toStdString(), 80));
+            qDebug() << "created insecure UserStore socket";
+        }
+
+        boost::shared_ptr<TBufferedTransport> bufferedTransport(new TBufferedTransport(socket));
+        m_userStoreHttpClient = boost::shared_ptr<THttpClient>(new THttpClient(bufferedTransport,
+                                                                            EVERNOTE_HOST.toStdString(),
+                                                                            EDAM_USER_STORE_PATH.toStdString()));
+        m_userStoreHttpClient->open();
+        boost::shared_ptr<TProtocol> iprot(new TBinaryProtocol(m_userStoreHttpClient));
+        m_userstoreClient = new evernote::edam::UserStoreClient(iprot);
+        evernote::edam::UserStoreConstants constants;
+        versionOK = m_userstoreClient->checkVersion(EDAM_CLIENT_NAME.toStdString(),
+                                                                      constants.EDAM_VERSION_MAJOR,
+                                                                      constants.EDAM_VERSION_MINOR);
+        qDebug() << "UserStoreClient created. Version check:" << versionOK;
+
+    } catch (const TTransportException & e) {
+        qWarning() << "Failed to create Transport for UserStore:" <<  e.what();
+    } catch (const TException & e) {
+        qWarning() << "Generic Thrift exception in UserStore setup:" << e.what();
+    }
+    return versionOK;
+}
+
+bool EvernoteConnection::setupNotesStore()
+{
+    try {
+        boost::shared_ptr<TSocket> socket;
+
+        if (m_useSSL) {
+            boost::shared_ptr<TSSLSocketFactory> sslSocketFactory(new TSSLSocketFactory());
+            socket = sslSocketFactory->createSocket(EVERNOTE_HOST.toStdString(), 443);
+            qDebug() << "created NotesStore SSL socket";
+        } else {
+            // Create a non-secure socket
+            socket = boost::shared_ptr<TSocket> (new TSocket(EVERNOTE_HOST.toStdString(), 80));
+            qDebug() << "created insecure NotesStore socket";
+        }
+
+        // setup UserStore
+        boost::shared_ptr<TBufferedTransport> bufferedTransport(new TBufferedTransport(socket));
+        m_notesStoreHttpClient = boost::shared_ptr<THttpClient>(new THttpClient(bufferedTransport,
+                                                                            EVERNOTE_HOST.toStdString(),
+                                                                            EDAM_NOTE_STORE_PATH.toStdString()));
+        m_notesStoreHttpClient->open();
+        boost::shared_ptr<TProtocol> iprot(new TBinaryProtocol(m_notesStoreHttpClient));
+
+        // setup notesstore
+        m_notesStoreClient = new evernote::edam::NoteStoreClient(iprot);
+
+        qDebug() << "NoteStore client created.";
+
+    } catch (const TTransportException & e) {
+        qWarning() << "Failed to create Transport for NotesStore:" <<  e.what();
+        return false;
+    } catch (const TException & e) {
+        qWarning() << "Generic Thrift exception in NotesStore setup:" << e.what();
+        return false;
+    }
+    return true;
+}
+
+EvernoteConnection *EvernoteConnection::instance()
+{
+    if (!s_instance) {
+        s_instance = new EvernoteConnection();
+    }
+    return s_instance;
+}
+
+EvernoteConnection::~EvernoteConnection()
+{
+    delete m_notesStoreClient;
+}
+
+QString EvernoteConnection::token() const
+{
+    return m_token;
+}
+
+void EvernoteConnection::setToken(const QString &token)
+{
+    if (token != m_token) {
+        m_token = token;
+        emit tokenChanged();
+    }
+}
+
+void EvernoteConnection::enqueue(EvernoteJob *job)
+{
+    connect(job, &EvernoteJob::finished, this, &EvernoteConnection::startNextJob);
+
+    m_jobQueue.append(job);
+    startJobQueue();
+}
+
+void EvernoteConnection::startJobQueue()
+{
+    if (m_jobQueue.isEmpty()) {
+        return;
+    }
+
+    if (m_currentJob) {
+        return;
+    }
+    m_currentJob = m_jobQueue.takeFirst();
+    m_currentJob->start();
+}
+
+void EvernoteConnection::startNextJob()
+{
+    m_currentJob = 0;
+    startJobQueue();
+}

=== added file 'src/plugin/Evernote/evernoteconnection.h'
--- src/plugin/Evernote/evernoteconnection.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/evernoteconnection.h	2013-11-28 00:46:50 +0000
@@ -0,0 +1,101 @@
+/*
+ * 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 EVERNOTECONNECTION_H
+#define EVERNOTECONNECTION_H
+
+#include <boost/shared_ptr.hpp>
+
+// Thrift
+#include <transport/THttpClient.h>
+
+#include <QObject>
+
+namespace evernote {
+namespace edam {
+class NoteStoreClient;
+class UserStoreClient;
+}
+}
+
+using namespace apache::thrift::transport;
+
+class EvernoteJob;
+
+class EvernoteConnection : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString token READ token WRITE setToken NOTIFY tokenChanged)
+
+    friend class NotesStoreJob;
+    friend class UserStoreJob;
+
+public:
+    enum ErrorCode {
+        ErrorCodeNoError,
+        ErrorCodeUserException,
+        ErrorCodeSystemException,
+        ErrorCodeNotFoundExcpetion,
+        ErrorCodeConnectionLost
+    };
+
+    static EvernoteConnection* instance();
+    ~EvernoteConnection();
+
+    QString token() const;
+    void setToken(const QString &token);
+
+    void enqueue(EvernoteJob *job);
+
+signals:
+    void tokenChanged();
+
+private slots:
+    void startJobQueue();
+    void startNextJob();
+
+private:
+    explicit EvernoteConnection(QObject *parent = 0);
+    static EvernoteConnection *s_instance;
+
+    bool setupUserStore();
+    bool setupNotesStore();
+
+    bool m_useSSL;
+
+    QString m_token;
+
+    // There must be only one job running at a time
+    // Do not start jobs other than with startJobQueue()
+    QList<EvernoteJob*> m_jobQueue;
+    EvernoteJob *m_currentJob;
+
+    // Those 4 are accessed from the job thread.
+    // Make sure to not access them while any jobs are running
+    // or we need to mutex them.
+    evernote::edam::NoteStoreClient *m_notesStoreClient;
+    boost::shared_ptr<THttpClient> m_notesStoreHttpClient;
+
+    evernote::edam::UserStoreClient *m_userstoreClient;
+    boost::shared_ptr<THttpClient> m_userStoreHttpClient;
+
+};
+
+#endif // EVERNOTECONNECTION_H

=== modified file 'src/plugin/Evernote/evernoteplugin.cpp'
--- src/plugin/Evernote/evernoteplugin.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/evernoteplugin.cpp	2013-11-28 00:46:50 +0000
@@ -20,6 +20,7 @@
 
 #include "evernoteplugin.h"
 
+#include "evernoteconnection.h"
 #include "userstore.h"
 #include "notesstore.h"
 #include "notes.h"
@@ -28,16 +29,27 @@
 
 #include <QtQml>
 
+static QObject* userStoreProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
+{
+    return UserStore::instance();
+}
+
 static QObject* notesStoreProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
 {
     return NotesStore::instance();
 }
 
+static QObject* connectionProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
+{
+    return EvernoteConnection::instance();
+}
+
 void FitBitPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterType<UserStore>("Evernote", 0, 1, "UserStore");
-
+    qmlRegisterSingletonType<UserStore>("Evernote", 0, 1, "UserStore", userStoreProvider);
     qmlRegisterSingletonType<NotesStore>("Evernote", 0, 1, "NotesStore", notesStoreProvider);
+    qmlRegisterSingletonType<EvernoteConnection>("Evernote", 0, 1, "EvernoteConnection", connectionProvider);
+
     qmlRegisterType<Notes>("Evernote", 0, 1, "Notes");
     qmlRegisterType<Notebooks>("Evernote", 0, 1, "Notebooks");
     qmlRegisterUncreatableType<Note>("Evernote", 0, 1, "Note", "Cannot create Notes in QML. Use NotesStore.createNote() instead.");

=== modified file 'src/plugin/Evernote/jobs/createnotejob.cpp'
--- src/plugin/Evernote/jobs/createnotejob.cpp	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/createnotejob.cpp	2013-11-28 00:46:50 +0000
@@ -23,7 +23,7 @@
 #include <QDebug>
 
 CreateNoteJob::CreateNoteJob(const QString &title, const QString &notebookGuid, const QString &content, QObject *parent) :
-    EvernoteJob(parent),
+    NotesStoreJob(parent),
     m_title(title),
     m_notebookGuid(notebookGuid),
     m_content(content)
@@ -45,7 +45,7 @@
     client()->createNote(m_resultNote, token().toStdString(), input);
 }
 
-void CreateNoteJob::emitJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage)
+void CreateNoteJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
 {
     emit jobDone(errorCode, errorMessage, m_resultNote);
 }

=== modified file 'src/plugin/Evernote/jobs/createnotejob.h'
--- src/plugin/Evernote/jobs/createnotejob.h	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/createnotejob.h	2013-11-28 00:46:50 +0000
@@ -1,21 +1,20 @@
 #ifndef CREATENOTEJOB_H
 #define CREATENOTEJOB_H
 
-#include "evernotejob.h"
-#include "note.h"
+#include "notesstorejob.h"
 
-class CreateNoteJob : public EvernoteJob
+class CreateNoteJob : public NotesStoreJob
 {
     Q_OBJECT
 public:
     explicit CreateNoteJob(const QString &title, const QString &notebookGuid, const QString &content, QObject *parent = 0);
 
 signals:
-    void jobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage, evernote::edam::Note note);
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, evernote::edam::Note note);
 
 protected:
     void startJob();
-    void emitJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage);
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
 
 private:
     QString m_title;

=== modified file 'src/plugin/Evernote/jobs/deletenotejob.cpp'
--- src/plugin/Evernote/jobs/deletenotejob.cpp	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/deletenotejob.cpp	2013-11-28 00:46:50 +0000
@@ -21,7 +21,7 @@
 #include "deletenotejob.h"
 
 DeleteNoteJob::DeleteNoteJob(const QString &guid, QObject *parent):
-    EvernoteJob(parent),
+    NotesStoreJob(parent),
     m_guid(guid)
 {
 }
@@ -31,7 +31,7 @@
     client()->deleteNote(token().toStdString(), m_guid.toStdString());
 }
 
-void DeleteNoteJob::emitJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage)
+void DeleteNoteJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
 {
     emit jobDone(errorCode, errorMessage, m_guid);
 }

=== modified file 'src/plugin/Evernote/jobs/deletenotejob.h'
--- src/plugin/Evernote/jobs/deletenotejob.h	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/deletenotejob.h	2013-11-28 00:46:50 +0000
@@ -1,20 +1,20 @@
 #ifndef DELETENOTEJOB_H
 #define DELETENOTEJOB_H
 
-#include "evernotejob.h"
+#include "notesstorejob.h"
 
-class DeleteNoteJob : public EvernoteJob
+class DeleteNoteJob : public NotesStoreJob
 {
     Q_OBJECT
 public:
     DeleteNoteJob(const QString &guid, QObject *parent = 0);
 
 signals:
-    void jobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage, const QString &guid);
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid);
 
 protected:
     void startJob();
-    void emitJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage);
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
 
 private:
     QString m_guid;

=== modified file 'src/plugin/Evernote/jobs/evernotejob.cpp'
--- src/plugin/Evernote/jobs/evernotejob.cpp	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/evernotejob.cpp	2013-11-28 00:46:50 +0000
@@ -19,6 +19,7 @@
  */
 
 #include "evernotejob.h"
+#include "evernoteconnection.h"
 
 // Thrift
 #include <arpa/inet.h> // seems thrift forgot this one
@@ -35,10 +36,9 @@
 
 EvernoteJob::EvernoteJob(QObject *parent) :
     QThread(parent),
-    m_token(NotesStore::instance()->token())
+    m_token(EvernoteConnection::instance()->token())
 {
     connect(this, &EvernoteJob::finished, this, &EvernoteJob::deleteLater);
-    connect(this, &EvernoteJob::finished, NotesStore::instance(), &NotesStore::startNextJob);
 }
 
 EvernoteJob::~EvernoteJob()
@@ -49,7 +49,7 @@
 {
     if (m_token.isEmpty()) {
         qWarning() << "No token set. Cannot execute job.";
-        emitJobDone(NotesStore::ErrorCodeUserException, QStringLiteral("No token set."));
+        emitJobDone(EvernoteConnection::ErrorCodeUserException, QStringLiteral("No token set."));
         return;
     }
 
@@ -62,36 +62,29 @@
         // so lets try to start the job once more.
         qWarning() << "Got a transport exception:" << e.what() << ". Trying to reestablish connection...";
         try {
-            NotesStore::instance()->m_httpClient->close();
-            NotesStore::instance()->m_httpClient->open();
-
+            resetConnection();
             startJob();
         } catch (const TTransportException &e) {
             // Giving up... the connection seems to be down for real.
             qWarning() << "Cannot reestablish connection:" << e.what();
-            emitJobDone(NotesStore::ErrorCodeConnectionLost, e.what());
+            emitJobDone(EvernoteConnection::ErrorCodeConnectionLost, e.what());
         } catch (const evernote::edam::EDAMUserException &e) {
-            emitJobDone(NotesStore::ErrorCodeUserException, e.what());
+            emitJobDone(EvernoteConnection::ErrorCodeUserException, e.what());
         } catch (const evernote::edam::EDAMSystemException &e) {
-            emitJobDone(NotesStore::ErrorCodeSystemException, e.what());
+            emitJobDone(EvernoteConnection::ErrorCodeSystemException, e.what());
         } catch (const evernote::edam::EDAMNotFoundException &e) {
-            emitJobDone(NotesStore::ErrorCodeNotFoundExcpetion, e.what());
+            emitJobDone(EvernoteConnection::ErrorCodeNotFoundExcpetion, e.what());
         }
 
     } catch (const evernote::edam::EDAMUserException &e) {
-        emitJobDone(NotesStore::ErrorCodeUserException, e.what());
+        emitJobDone(EvernoteConnection::ErrorCodeUserException, e.what());
     } catch (const evernote::edam::EDAMSystemException &e) {
-        emitJobDone(NotesStore::ErrorCodeSystemException, e.what());
+        emitJobDone(EvernoteConnection::ErrorCodeSystemException, e.what());
     } catch (const evernote::edam::EDAMNotFoundException &e) {
-        emitJobDone(NotesStore::ErrorCodeNotFoundExcpetion, e.what());
+        emitJobDone(EvernoteConnection::ErrorCodeNotFoundExcpetion, e.what());
     }
 
-    emitJobDone(NotesStore::ErrorCodeNoError, QString());
-}
-
-evernote::edam::NoteStoreClient *EvernoteJob::client()
-{
-    return NotesStore::instance()->m_client;
+    emitJobDone(EvernoteConnection::ErrorCodeNoError, QString());
 }
 
 QString EvernoteJob::token()

=== modified file 'src/plugin/Evernote/jobs/evernotejob.h'
--- src/plugin/Evernote/jobs/evernotejob.h	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/evernotejob.h	2013-11-28 00:46:50 +0000
@@ -3,11 +3,6 @@
 
 #include "notesstore.h"
 
-// Evernote SDK
-#include <NoteStore.h>
-#include <NoteStore_constants.h>
-#include <Errors_types.h>
-
 #include <QThread>
 
 /* How to create a new Job type:
@@ -15,7 +10,7 @@
  * - Implement startJob() in which you do the call to evernote.
  *   - No need to catch exceptions, EvernoteJob will deal with those.
  * - Define a jobDone() signal with the result parameters you need.
- *   - Keep the convention of jobDone(NotesStore::ErrorCode errorCode, const QString &message [, ...])
+ *   - Keep the convention of jobDone(EvernoteConnection::ErrorCode errorCode, const QString &message [, ...])
  * - Emit jobDone() in your implementation of emitJobDone().
  *   - NOTE: emitJobDone() might be called with an error even before startJob() is triggered.
  *
@@ -36,10 +31,10 @@
     void connectionLost(const QString &errorMessage);
 
 protected:
+    virtual void resetConnection() = 0;
     virtual void startJob() = 0;
-    virtual void emitJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage) = 0;
+    virtual void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage) = 0;
 
-    evernote::edam::NoteStoreClient* client();
     QString token();
 
 private:

=== modified file 'src/plugin/Evernote/jobs/fetchnotebooksjob.cpp'
--- src/plugin/Evernote/jobs/fetchnotebooksjob.cpp	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/fetchnotebooksjob.cpp	2013-11-28 00:46:50 +0000
@@ -23,7 +23,7 @@
 #include <QDebug>
 
 FetchNotebooksJob::FetchNotebooksJob(QObject *parent) :
-    EvernoteJob(parent)
+    NotesStoreJob(parent)
 {
 }
 
@@ -33,7 +33,7 @@
     client()->listNotebooks(m_results, token().toStdString());
 }
 
-void FetchNotebooksJob::emitJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage)
+void FetchNotebooksJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
 {
     emit jobDone(errorCode, errorMessage, m_results);
 }

=== modified file 'src/plugin/Evernote/jobs/fetchnotebooksjob.h'
--- src/plugin/Evernote/jobs/fetchnotebooksjob.h	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/fetchnotebooksjob.h	2013-11-28 00:46:50 +0000
@@ -1,20 +1,20 @@
 #ifndef FETCHNOTEBOOKSJOB_H
 #define FETCHNOTEBOOKSJOB_H
 
-#include "evernotejob.h"
+#include "notesstorejob.h"
 
-class FetchNotebooksJob : public EvernoteJob
+class FetchNotebooksJob : public NotesStoreJob
 {
     Q_OBJECT
 public:
     explicit FetchNotebooksJob(QObject *parent = 0);
 
 signals:
-    void jobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage, const std::vector<evernote::edam::Notebook> &results);
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const std::vector<evernote::edam::Notebook> &results);
 
 protected:
     void startJob();
-    void emitJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage);
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
 
 private:
     std::vector<evernote::edam::Notebook> m_results;

=== modified file 'src/plugin/Evernote/jobs/fetchnotejob.cpp'
--- src/plugin/Evernote/jobs/fetchnotejob.cpp	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/fetchnotejob.cpp	2013-11-28 00:46:50 +0000
@@ -21,7 +21,7 @@
 #include "fetchnotejob.h"
 
 FetchNoteJob::FetchNoteJob(const QString &guid, QObject *parent) :
-    EvernoteJob(parent),
+    NotesStoreJob(parent),
     m_guid(guid)
 {
 }
@@ -31,7 +31,7 @@
     client()->getNote(m_result, token().toStdString(), m_guid.toStdString(), true, true, false, false);
 }
 
-void FetchNoteJob::emitJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage)
+void FetchNoteJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
 {
     emit resultReady(errorCode, errorMessage, m_result);
 }

=== modified file 'src/plugin/Evernote/jobs/fetchnotejob.h'
--- src/plugin/Evernote/jobs/fetchnotejob.h	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/fetchnotejob.h	2013-11-28 00:46:50 +0000
@@ -1,20 +1,20 @@
 #ifndef FETCHNOTEJOB_H
 #define FETCHNOTEJOB_H
 
-#include "evernotejob.h"
+#include "notesstorejob.h"
 
-class FetchNoteJob : public EvernoteJob
+class FetchNoteJob : public NotesStoreJob
 {
     Q_OBJECT
 public:
     explicit FetchNoteJob(const QString &guid, QObject *parent = 0);
 
 signals:
-    void resultReady(NotesStore::ErrorCode error, const QString &errorMessage, const evernote::edam::Note &note);
+    void resultReady(EvernoteConnection::ErrorCode error, const QString &errorMessage, const evernote::edam::Note &note);
 
 protected:
     void startJob();
-    void emitJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage);
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
 
 private:
     evernote::edam::NoteStoreClient *m_client;

=== modified file 'src/plugin/Evernote/jobs/fetchnotesjob.cpp'
--- src/plugin/Evernote/jobs/fetchnotesjob.cpp	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/fetchnotesjob.cpp	2013-11-28 00:46:50 +0000
@@ -25,13 +25,14 @@
 #include <QDebug>
 
 FetchNotesJob::FetchNotesJob( const QString &filterNotebookGuid, QObject *parent) :
-    EvernoteJob(parent),
+    NotesStoreJob(parent),
     m_filterNotebookGuid(filterNotebookGuid)
 {
 }
 
 void FetchNotesJob::startJob()
 {
+    qDebug() << "starting fetch notes job";
     // TODO: fix start/end (use smaller chunks and continue fetching if there are more notes available)
     int32_t start = 0;
     int32_t end = 10000;
@@ -49,9 +50,10 @@
     resultSpec.__isset.includeTitle = true;
 
     client()->findNotesMetadata(m_results, token().toStdString(), filter, start, end, resultSpec);
+    qDebug() << "ending fetch notes job";
 }
 
-void FetchNotesJob::emitJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage)
+void FetchNotesJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
 {
     emit jobDone(errorCode, errorMessage, m_results);
 }

=== modified file 'src/plugin/Evernote/jobs/fetchnotesjob.h'
--- src/plugin/Evernote/jobs/fetchnotesjob.h	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/fetchnotesjob.h	2013-11-28 00:46:50 +0000
@@ -1,20 +1,20 @@
 #ifndef FETCHNOTESJOB_H
 #define FETCHNOTESJOB_H
 
-#include "evernotejob.h"
+#include "notesstorejob.h"
 
-class FetchNotesJob : public EvernoteJob
+class FetchNotesJob : public NotesStoreJob
 {
     Q_OBJECT
 public:
     explicit FetchNotesJob(const QString &filterNotebookGuid, QObject *parent = 0);
 
 signals:
-    void jobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results);
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results);
 
 protected:
     void startJob();
-    void emitJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage);
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
 
 private:
     QString m_filterNotebookGuid;

=== added file 'src/plugin/Evernote/jobs/fetchusernamejob.cpp'
--- src/plugin/Evernote/jobs/fetchusernamejob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/fetchusernamejob.cpp	2013-11-28 00:46:50 +0000
@@ -0,0 +1,38 @@
+/*
+ * 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 "fetchusernamejob.h"
+
+FetchUsernameJob::FetchUsernameJob(QObject *parent) :
+    UserStoreJob(parent)
+{
+}
+
+void FetchUsernameJob::startJob()
+{
+    evernote::edam::User user;
+    client()->getUser(user, token().toStdString());
+    m_result = QString::fromStdString(user.username);
+}
+
+void FetchUsernameJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    emit jobDone(errorCode, errorMessage, m_result);
+}

=== added file 'src/plugin/Evernote/jobs/fetchusernamejob.h'
--- src/plugin/Evernote/jobs/fetchusernamejob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/fetchusernamejob.h	2013-11-28 00:46:50 +0000
@@ -0,0 +1,43 @@
+/*
+ * 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 FETCHUSERNAMEJOB_H
+#define FETCHUSERNAMEJOB_H
+
+#include "userstorejob.h"
+
+class FetchUsernameJob : public UserStoreJob
+{
+    Q_OBJECT
+public:
+    explicit FetchUsernameJob(QObject *parent = 0);
+
+signals:
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &result);
+
+protected:
+    void startJob();
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
+
+private:
+    QString m_result;
+};
+
+#endif // FETCHUSERNAMEJOB_H

=== added file 'src/plugin/Evernote/jobs/notesstorejob.cpp'
--- src/plugin/Evernote/jobs/notesstorejob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/notesstorejob.cpp	2013-11-28 00:46:50 +0000
@@ -0,0 +1,39 @@
+/*
+ * 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 "notesstorejob.h"
+
+#include "evernoteconnection.h"
+
+NotesStoreJob::NotesStoreJob(QObject *parent) :
+    EvernoteJob(parent)
+{
+}
+
+void NotesStoreJob::resetConnection()
+{
+    EvernoteConnection::instance()->m_notesStoreHttpClient->close();
+    EvernoteConnection::instance()->m_notesStoreHttpClient->open();
+}
+
+evernote::edam::NoteStoreClient *NotesStoreJob::client() const
+{
+    return EvernoteConnection::instance()->m_notesStoreClient;
+}

=== added file 'src/plugin/Evernote/jobs/notesstorejob.h'
--- src/plugin/Evernote/jobs/notesstorejob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/notesstorejob.h	2013-11-28 00:46:50 +0000
@@ -0,0 +1,44 @@
+/*
+ * 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 NOTESSTOREJOB_H
+#define NOTESSTOREJOB_H
+
+#include "evernotejob.h"
+
+// Evernote SDK
+#include <NoteStore.h>
+#include <NoteStore_constants.h>
+#include <Errors_types.h>
+
+class NotesStoreJob : public EvernoteJob
+{
+    Q_OBJECT
+public:
+    explicit NotesStoreJob(QObject *parent = 0);
+
+protected:
+    void resetConnection() final;
+
+    evernote::edam::NoteStoreClient *client() const;
+
+};
+
+#endif // NOTESSTOREJOB_H

=== modified file 'src/plugin/Evernote/jobs/savenotejob.cpp'
--- src/plugin/Evernote/jobs/savenotejob.cpp	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/savenotejob.cpp	2013-11-28 00:46:50 +0000
@@ -24,7 +24,7 @@
 #include <QDebug>
 
 SaveNoteJob::SaveNoteJob(Note *note, QObject *parent) :
-    EvernoteJob(parent),
+    NotesStoreJob(parent),
     m_guid(note->guid()),
     m_title(note->title()),
     m_notebookGuid(note->notebookGuid()),
@@ -48,7 +48,7 @@
     client()->updateNote(m_note, token().toStdString(), note);
 }
 
-void SaveNoteJob::emitJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage)
+void SaveNoteJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
 {
     emit jobDone(errorCode, errorMessage, m_note);
 }

=== modified file 'src/plugin/Evernote/jobs/savenotejob.h'
--- src/plugin/Evernote/jobs/savenotejob.h	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/jobs/savenotejob.h	2013-11-28 00:46:50 +0000
@@ -1,20 +1,20 @@
 #ifndef SAVENOTEJOB_H
 #define SAVENOTEJOB_H
 
-#include "evernotejob.h"
+#include "notesstorejob.h"
 
-class SaveNoteJob : public EvernoteJob
+class SaveNoteJob : public NotesStoreJob
 {
     Q_OBJECT
 public:
     explicit SaveNoteJob(Note *note, QObject *parent = 0);
 
 signals:
-    void jobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &note);
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &note);
 
 protected:
     void startJob();
-    void emitJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage);
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
 
 private:
     QString m_guid;

=== added file 'src/plugin/Evernote/jobs/userstorejob.cpp'
--- src/plugin/Evernote/jobs/userstorejob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/userstorejob.cpp	2013-11-28 00:46:50 +0000
@@ -0,0 +1,39 @@
+/*
+ * 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 "userstorejob.h"
+
+#include "evernoteconnection.h"
+
+UserStoreJob::UserStoreJob(QObject *parent) :
+    EvernoteJob(parent)
+{
+}
+
+void UserStoreJob::resetConnection()
+{
+    EvernoteConnection::instance()->m_userStoreHttpClient->close();
+    EvernoteConnection::instance()->m_userStoreHttpClient->open();
+}
+
+evernote::edam::UserStoreClient *UserStoreJob::client() const
+{
+    return EvernoteConnection::instance()->m_userstoreClient;
+}

=== added file 'src/plugin/Evernote/jobs/userstorejob.h'
--- src/plugin/Evernote/jobs/userstorejob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/userstorejob.h	2013-11-28 00:46:50 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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 USERSTOREJOB_H
+#define USERSTOREJOB_H
+
+#include "evernotejob.h"
+
+// Evernote SDK
+#include <UserStore.h>
+#include <UserStore_constants.h>
+#include <Errors_types.h>
+
+class UserStoreJob : public EvernoteJob
+{
+    Q_OBJECT
+public:
+    explicit UserStoreJob(QObject *parent = 0);
+
+protected:
+    void resetConnection() final;
+
+    evernote::edam::UserStoreClient* client() const;
+
+public slots:
+
+};
+
+#endif // USERSTOREJOB_H

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/notesstore.cpp	2013-11-28 00:46:50 +0000
@@ -19,6 +19,7 @@
  */
 
 #include "notesstore.h"
+#include "evernoteconnection.h"
 #include "notebooks.h"
 #include "notebook.h"
 #include "note.h"
@@ -31,69 +32,17 @@
 #include "jobs/savenotejob.h"
 #include "jobs/deletenotejob.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;
-
 NotesStore* NotesStore::s_instance = 0;
 
 NotesStore::NotesStore(QObject *parent) :
-    QObject(parent),
-    m_currentJob(0)
+    QObject(parent)
 {
-    try {
-        // FIXME: need to populate this string from the system
-        // The structure should be:
-        // application/version; platform/version; [ device/version ]
-        // E.g. "Evernote Windows/3.0.1; Windows/XP SP3"
-        QString EDAM_CLIENT_NAME = QStringLiteral("Reminders/0.1; Ubuntu/13.10");
-        QString EVERNOTE_HOST = QStringLiteral("sandbox.evernote.com");
-        QString EDAM_USER_STORE_PATH = QStringLiteral("/edam/note");
-        boost::shared_ptr<TSocket> socket;
-        bool use_SSL = true;
-
-        if (use_SSL) {
-            // Create an SSL socket
-            // FIXME: this fails with the following error:
-            //   Thrift: Fri Nov 15 12:47:31 2013 SSL_shutdown: error code: 0
-            //   SSL_get_verify_result(), unable to get local issuer certificate
-            // Additionally, the UI blocks and does not load for about 2 minutes
-            boost::shared_ptr<TSSLSocketFactory> sslSocketFactory(new TSSLSocketFactory());
-            socket = sslSocketFactory->createSocket(EVERNOTE_HOST.toStdString(), 443);
-            qDebug() << "created SSL socket";
-        } else {
-            // Create a non-secure socket
-            socket = boost::shared_ptr<TSocket> (new TSocket(EVERNOTE_HOST.toStdString(), 80));
-            qDebug() << "created insecure socket";
-        }
-
-        boost::shared_ptr<TBufferedTransport> bufferedTransport(new TBufferedTransport(socket));
-        m_httpClient = boost::shared_ptr<THttpClient>(new THttpClient(bufferedTransport,
-                                                                            EVERNOTE_HOST.toStdString(),
-                                                                            EDAM_USER_STORE_PATH.toStdString()));
-        m_httpClient->open();
-
-        boost::shared_ptr<TProtocol> iprot(new TBinaryProtocol(m_httpClient));
-        m_client = new evernote::edam::NoteStoreClient(iprot);
-
-        qDebug() << "NoteStore client created.";
-
-    } catch (const TTransportException & e) {
-        qWarning() << "Failed to create Transport:" <<  e.what();
-    } catch (const TException & e) {
-        qWarning() << "Generic Thrift exception:" << e.what();
-    }
-
-    qRegisterMetaType<NotesStore::ErrorCode>("NotesStore::ErrorCode");
+    connect(EvernoteConnection::instance(), &EvernoteConnection::tokenChanged, this, &NotesStore::refreshNotebooks);
+    connect(EvernoteConnection::instance(), SIGNAL(tokenChanged()), this, SLOT(refreshNotes()));
+
+    qRegisterMetaType<EvernoteConnection::ErrorCode>("EvernoteConnection::ErrorCode");
     qRegisterMetaType<evernote::edam::NotesMetadataList>("evernote::edam::NotesMetadataList");
     qRegisterMetaType<evernote::edam::Note>("evernote::edam::Note");
     qRegisterMetaType<std::vector<evernote::edam::Notebook> >("std::vector<evernote::edam::Notebook>");
@@ -108,39 +57,8 @@
     return s_instance;
 }
 
-QString NotesStore::errorCodeToString(NotesStore::ErrorCode errorCode)
-{
-    switch(errorCode) {
-    case ErrorCodeNoError:
-        return QStringLiteral("No error");
-    case ErrorCodeUserException:
-        return QStringLiteral("User exception");
-    case ErrorCodeSystemException:
-        return QStringLiteral("System exception");
-    case ErrorCodeNotFoundExcpetion:
-        return QStringLiteral("Not found");
-    }
-    return QString();
-}
-
 NotesStore::~NotesStore()
 {
-    delete m_client;
-}
-
-QString NotesStore::token() const
-{
-    return m_token;
-}
-
-void NotesStore::setToken(const QString &token)
-{
-    if (token != m_token) {
-        m_token = token;
-        emit tokenChanged();
-        refreshNotebooks();
-        refreshNotes();
-    }
 }
 
 QList<Note*> NotesStore::notes() const
@@ -163,41 +81,16 @@
     return m_notebooks.value(guid);
 }
 
-void NotesStore::enqueue(EvernoteJob *job)
-{
-    m_jobQueue.append(job);
-    startJobQueue();
-}
-
-void NotesStore::startJobQueue()
-{
-    if (m_jobQueue.isEmpty()) {
-        return;
-    }
-
-    if (m_currentJob) {
-        return;
-    }
-    m_currentJob = m_jobQueue.takeFirst();
-    m_currentJob->start();
-}
-
-void NotesStore::startNextJob()
-{
-    m_currentJob = 0;
-    startJobQueue();
-}
-
 void NotesStore::refreshNotes(const QString &filterNotebookGuid)
 {
     FetchNotesJob *job = new FetchNotesJob(filterNotebookGuid);
     connect(job, &FetchNotesJob::jobDone, this, &NotesStore::fetchNotesJobDone);
-    enqueue(job);
+    EvernoteConnection::instance()->enqueue(job);
 }
 
-void NotesStore::fetchNotesJobDone(ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results)
+void NotesStore::fetchNotesJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results)
 {
-    if (errorCode != ErrorCodeNoError) {
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
         qWarning() << "Failed to fetch notes list:" << errorMessage;
         return;
     }
@@ -223,12 +116,12 @@
 {
     FetchNoteJob *job = new FetchNoteJob(guid, this);
     connect(job, &FetchNoteJob::resultReady, this, &NotesStore::fetchNoteJobDone);
-    enqueue(job);
+    EvernoteConnection::instance()->enqueue(job);
 }
 
-void NotesStore::fetchNoteJobDone(ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result)
+void NotesStore::fetchNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result)
 {
-    if (errorCode != ErrorCodeNoError) {
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
         qWarning() << "Error fetching note:" << errorMessage;
         return;
     }
@@ -244,12 +137,12 @@
 {
     FetchNotebooksJob *job = new FetchNotebooksJob();
     connect(job, &FetchNotebooksJob::jobDone, this, &NotesStore::fetchNotebooksJobDone);
-    enqueue(job);
+    EvernoteConnection::instance()->enqueue(job);
 }
 
-void NotesStore::fetchNotebooksJobDone(ErrorCode errorCode, const QString &errorMessage, const std::vector<evernote::edam::Notebook> &results)
+void NotesStore::fetchNotebooksJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const std::vector<evernote::edam::Notebook> &results)
 {
-    if (errorCode != ErrorCodeNoError) {
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
         qWarning() << "Error fetching notebooks:" << errorMessage;
         return;
     }
@@ -275,12 +168,12 @@
 {
     CreateNoteJob *job = new CreateNoteJob(title, notebookGuid, content);
     connect(job, &CreateNoteJob::jobDone, this, &NotesStore::createNoteJobDone);
-    enqueue(job);
+    EvernoteConnection::instance()->enqueue(job);
 }
 
-void NotesStore::createNoteJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result)
+void NotesStore::createNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result)
 {
-    if (errorCode != ErrorCodeNoError) {
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
         qWarning() << "Error creating note:" << errorMessage;
         return;
     }
@@ -303,12 +196,12 @@
 
     SaveNoteJob *job = new SaveNoteJob(note, this);
     connect(job, &SaveNoteJob::jobDone, this, &NotesStore::saveNoteJobDone);
-    enqueue(job);
+    EvernoteConnection::instance()->enqueue(job);
 }
 
-void NotesStore::saveNoteJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result)
+void NotesStore::saveNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result)
 {
-    if (errorCode != ErrorCodeNoError) {
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
         qWarning() << "error saving note" << errorMessage;
         return;
     }
@@ -326,12 +219,12 @@
 {
     DeleteNoteJob *job = new DeleteNoteJob(guid, this);
     connect(job, &DeleteNoteJob::jobDone, this, &NotesStore::deleteNoteJobDone);
-    enqueue(job);
+    EvernoteConnection::instance()->enqueue(job);
 }
 
-void NotesStore::deleteNoteJobDone(NotesStore::ErrorCode errorCode, const QString &errorMessage, const QString &guid)
+void NotesStore::deleteNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid)
 {
-    if (errorCode != ErrorCodeNoError) {
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
         qWarning() << "Cannot delete note:" << errorMessage;
         return;
     }

=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2013-11-28 00:46:50 +0000
+++ src/plugin/Evernote/notesstore.h	2013-11-28 00:46:50 +0000
@@ -1,8 +1,14 @@
 #ifndef NOTESSTORE_H
 #define NOTESSTORE_H
 
+#include "evernoteconnection.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>
 
 // Evernote SDK
 #include <NoteStore.h>
@@ -12,8 +18,6 @@
 #include <QObject>
 #include <QHash>
 
-class EvernoteJob;
-
 class Notebook;
 class Note;
 
@@ -22,29 +26,14 @@
 class NotesStore : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QString token READ token WRITE setToken NOTIFY tokenChanged)
-
-    friend class EvernoteJob;
 
 public:
-    enum ErrorCode {
-        ErrorCodeNoError,
-        ErrorCodeUserException,
-        ErrorCodeSystemException,
-        ErrorCodeNotFoundExcpetion,
-        ErrorCodeConnectionLost
-    };
-
     Q_INVOKABLE void createNote(const QString &title, const QString &notebookGuid, const QString &content);
 
     static NotesStore *instance();
-    static QString errorCodeToString(ErrorCode errorCode);
 
     ~NotesStore();
 
-    QString token() const;
-    void setToken(const QString &token);
-
     QList<Note*> notes() const;
     Note* note(const QString &guid);
     void saveNote(const QString &guid);
@@ -53,6 +42,7 @@
     QList<Notebook*> notebooks() const;
     Notebook* notebook(const QString &guid);
 
+public slots:
     void refreshNotes(const QString &filterNotebookGuid = QString());
     void refreshNoteContent(const QString &guid);
     void refreshNotebooks();
@@ -68,41 +58,20 @@
     void notebookChanged(const QString &guid);
 
 private slots:
-    void fetchNotesJobDone(ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results);
-    void fetchNotebooksJobDone(ErrorCode errorCode, const QString &errorMessage, const std::vector<evernote::edam::Notebook> &results);
-    void fetchNoteJobDone(ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);
-    void createNoteJobDone(ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);
-    void saveNoteJobDone(ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);
-    void deleteNoteJobDone(ErrorCode errorCode, const QString &errorMessage, const QString &guid);
-
-    // Use this to enqueue a new job. It will automatically start it if there is no other job pending.
-    void enqueue(EvernoteJob *job);
-    void startJobQueue();
-
-    // You should not use this. It's called by the job queue.
-    // If you have a new job to run, just enqueue it. The queue will process it eventually.
-    void startNextJob();
+    void fetchNotesJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results);
+    void fetchNotebooksJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const std::vector<evernote::edam::Notebook> &results);
+    void fetchNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);
+    void createNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);
+    void saveNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);
+    void deleteNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid);
 
 private:
     explicit NotesStore(QObject *parent = 0);
     static NotesStore *s_instance;
 
-    QString m_token;
-
     QHash<QString, Notebook*> m_notebooks;
     QHash<QString, Note*> m_notes;
 
-    // There must be only one job running at a time
-    // Do not start jobs other than with startJobQueue()
-    QList<EvernoteJob*> m_jobQueue;
-    EvernoteJob *m_currentJob;
-
-    // Those two are accessed from the job thread.
-    // Make sure to not access them while any jobs are running
-    // or we need to mutex them.
-    evernote::edam::NoteStoreClient *m_client;
-    boost::shared_ptr<THttpClient> m_httpClient;
-
 };
 
 #endif // NOTESSTORE_H

=== modified file 'src/plugin/Evernote/userstore.cpp'
--- src/plugin/Evernote/userstore.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/userstore.cpp	2013-11-28 00:46:50 +0000
@@ -19,6 +19,8 @@
  */
 
 #include "userstore.h"
+#include "evernoteconnection.h"
+#include "jobs/fetchusernamejob.h"
 
 // Evernote sdk
 #include <UserStore.h>
@@ -34,106 +36,47 @@
 
 #include <QDebug>
 
-using namespace evernote::edam;
 using namespace apache::thrift;
 using namespace apache::thrift::protocol;
 using namespace apache::thrift::transport;
 
+UserStore* UserStore::s_instance = 0;
+
 UserStore::UserStore(QObject *parent) :
     QObject(parent)
 {
-
-    try {
-        // FIXME: need to populate this string from the system
-        // The structure should be:
-        // application/version; platform/version; [ device/version ]
-        // E.g. "Evernote Windows/3.0.1; Windows/XP SP3"
-        QString EDAM_CLIENT_NAME = QStringLiteral("Reminders/0.1; Ubuntu/13.10");
-        QString EVERNOTE_HOST = QStringLiteral("sandbox.evernote.com");
-        QString EDAM_USER_STORE_PATH = QStringLiteral("/edam/user");
-        boost::shared_ptr<TSocket> socket;
-        bool use_SSL = false;
-
-        if (use_SSL) {
-            // Create an SSL socket
-            // FIXME: this fails with the following error:
-            //   Thrift: Fri Nov 15 12:47:31 2013 SSL_shutdown: error code: 0
-            //   SSL_get_verify_result(), unable to get local issuer certificate
-            // Additionally, the UI blocks and does not load for about 2 minutes
-            boost::shared_ptr<TSSLSocketFactory> sslSocketFactory(new TSSLSocketFactory());
-            socket = sslSocketFactory->createSocket(EVERNOTE_HOST.toStdString(), 443);
-        } else {
-            // Create a non-secure socket
-            socket = boost::shared_ptr<TSocket> (new TSocket(EVERNOTE_HOST.toStdString(), 80));
-        }
-
-        boost::shared_ptr<TBufferedTransport> bufferedTransport(new TBufferedTransport(socket));
-        boost::shared_ptr<THttpClient> userStoreHttpClient (new THttpClient(bufferedTransport,
-                                                                            EVERNOTE_HOST.toStdString(),
-                                                                            EDAM_USER_STORE_PATH.toStdString()));
-        userStoreHttpClient->open();
-
-        boost::shared_ptr<TProtocol> iprot(new TBinaryProtocol(userStoreHttpClient));
-        UserStoreClient m_client(iprot);
-        UserStoreConstants constants;
-
-        // checkVersion returns true if the client is capable of talking to the service,
-        // false otherwise
-        qDebug() << "version check:" << m_client.checkVersion(EDAM_CLIENT_NAME.toStdString(),
-                                                              constants.EDAM_VERSION_MAJOR,
-                                                              constants.EDAM_VERSION_MINOR);
-
-    } catch(...) {
-        displayException();
-    }
-}
-
-void UserStore::getPublicUserInfo(const QString &user)
-{
-    qDebug() << "should get public user info for user" << user;
-    //    PublicUserInfo userInfo;
-
-}
-
-// TODO: move to a common place instead of copying it through *store.cpps
-void UserStore::displayException()
-{
-    QString error_message = "Unknown Exception";
-    try
-    {
-        // this function is meant to be called from a catch block
-        // rethrow the exception to catch it again
-        throw;
-    }
-    catch (const EDAMNotFoundException & e)
-    {
-        qDebug() <<  e.what();
-    }
-    catch (const EDAMSystemException & e)
-    {
-        qDebug() <<  e.what();
-    }
-    catch (const EDAMUserException & e)
-    {
-        qDebug() <<  e.what();
-    }
-    catch (const TTransportException & e)
-    {
-        qDebug() <<  e.what();
-    }
-    catch (const TException & e)
-    {
-        qDebug() <<  e.what();
-    }
-    catch (const std::exception & e)
-    {
-        qDebug() <<  e.what();
-    }
-    catch (...)
-    {
-        error_message = "Tried to sync, but something went wrong.\n Unknown exception.";
-    }
-
-    qDebug() << error_message;
-    disconnect();
+    connect(EvernoteConnection::instance(), &EvernoteConnection::tokenChanged, this, &UserStore::fetchUsername);
+
+    fetchUsername();
+}
+
+UserStore *UserStore::instance()
+{
+    if (!s_instance) {
+        s_instance = new UserStore();
+    }
+    return s_instance;
+}
+
+QString UserStore::username() const
+{
+    return m_username;
+}
+
+void UserStore::fetchUsername()
+{
+    FetchUsernameJob *job = new FetchUsernameJob();
+    connect(job, &FetchUsernameJob::jobDone, this, &UserStore::fetchUsernameJobDone);
+    EvernoteConnection::instance()->enqueue(job);
+}
+
+void UserStore::fetchUsernameJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &result)
+{
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
+        qWarning() << "Error fetching username:" << errorMessage;
+        return;
+    }
+
+    m_username = result;
+    emit usernameChanged();
 }

=== modified file 'src/plugin/Evernote/userstore.h'
--- src/plugin/Evernote/userstore.h	2013-11-24 17:03:28 +0000
+++ src/plugin/Evernote/userstore.h	2013-11-28 00:46:50 +0000
@@ -1,6 +1,9 @@
 #ifndef USERSTORE_H
 #define USERSTORE_H
 
+#include "evernoteconnection.h"
+
+//Evernote SDK
 #include "UserStore.h"
 
 #include <QObject>
@@ -8,17 +11,28 @@
 class UserStore : public QObject
 {
     Q_OBJECT
+
+    // TODO: Once we need more than just the username, turn this into a class User
+    Q_PROPERTY(QString username READ username NOTIFY usernameChanged)
+
 public:
-    explicit UserStore(QObject *parent = 0);
+    static UserStore* instance();
+
+    QString username() const;
 
 signals:
-
-public slots:
-    void getPublicUserInfo(const QString &user);
+    void usernameChanged();
+
+private slots:
+    void fetchUsername();
+
+    void fetchUsernameJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &result);
 
 private:
+    static UserStore* s_instance;
+    explicit UserStore(QObject *parent = 0);
 
-    void displayException();
+    QString m_username;
 };
 
 #endif // USERSTORE_H