Merge lp:~mzanetti/reminders-app/clear-on-logout into lp:reminders-app

[Michael Zanetti]

properly react to clearing the token

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

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

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Works as expected! Thanks!

review: Approve

=== modified file 'src/plugin/Evernote/notebooks.cpp'
--- src/plugin/Evernote/notebooks.cpp	2014-01-27 13:00:41 +0000
+++ src/plugin/Evernote/notebooks.cpp	2014-02-05 20:44:23 +0000
@@ -32,6 +32,7 @@
     }
 
     connect(NotesStore::instance(), SIGNAL(notebookAdded(const QString &)), SLOT(notebookAdded(const QString &)));
+    connect(NotesStore::instance(), SIGNAL(notebookRemoved(const QString &)), SLOT(notebookRemoved(const QString &)));
 }
 
 QVariant Notebooks::data(const QModelIndex &index, int role) const
@@ -85,6 +86,13 @@
     endInsertRows();
 }
 
+void Notebooks::notebookRemoved(const QString &guid)
+{
+    beginRemoveRows(QModelIndex(), m_list.indexOf(guid), m_list.indexOf(guid));
+    m_list.removeAll(guid);
+    endRemoveRows();
+}
+
 void Notebooks::noteCountChanged()
 {
     Notebook *notebook = static_cast<Notebook*>(sender());

=== modified file 'src/plugin/Evernote/notebooks.h'
--- src/plugin/Evernote/notebooks.h	2014-01-27 13:00:41 +0000
+++ src/plugin/Evernote/notebooks.h	2014-02-05 20:44:23 +0000
@@ -48,6 +48,7 @@
 
 private slots:
     void notebookAdded(const QString &guid);
+    void notebookRemoved(const QString &guid);
     void noteCountChanged();
 
 private:

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2014-02-05 17:26:54 +0000
+++ src/plugin/Evernote/notesstore.cpp	2014-02-05 20:44:23 +0000
@@ -157,9 +157,19 @@
 
 void NotesStore::refreshNotes(const QString &filterNotebookGuid)
 {
-    FetchNotesJob *job = new FetchNotesJob(filterNotebookGuid);
-    connect(job, &FetchNotesJob::jobDone, this, &NotesStore::fetchNotesJobDone);
-    EvernoteConnection::instance()->enqueue(job);
+    if (EvernoteConnection::instance()->token().isEmpty()) {
+        beginResetModel();
+        foreach (Note *note, m_notes) {
+            emit noteRemoved(note->guid(), note->notebookGuid());
+            note->deleteLater();
+        }
+        m_notes.clear();
+        endResetModel();
+    } else {
+        FetchNotesJob *job = new FetchNotesJob(filterNotebookGuid);
+        connect(job, &FetchNotesJob::jobDone, this, &NotesStore::fetchNotesJobDone);
+        EvernoteConnection::instance()->enqueue(job);
+    }
 }
 
 void NotesStore::fetchNotesJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results)
@@ -227,6 +237,10 @@
     }
 
     Note *note = m_notesHash.value(QString::fromStdString(result.guid));
+    if (note) {
+        qWarning() << "can't find note for this update... ignoring...";
+        return;
+    }
     note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
     note->setTitle(QString::fromStdString(result.title));
 
@@ -263,9 +277,17 @@
 
 void NotesStore::refreshNotebooks()
 {
-    FetchNotebooksJob *job = new FetchNotebooksJob();
-    connect(job, &FetchNotebooksJob::jobDone, this, &NotesStore::fetchNotebooksJobDone);
-    EvernoteConnection::instance()->enqueue(job);
+    if (EvernoteConnection::instance()->token().isEmpty()) {
+        foreach (Notebook *notebook, m_notebooks) {
+            emit notebookRemoved(notebook->guid());
+            notebook->deleteLater();
+        }
+        m_notebooks.clear();
+    } else {
+        FetchNotebooksJob *job = new FetchNotebooksJob();
+        connect(job, &FetchNotebooksJob::jobDone, this, &NotesStore::fetchNotebooksJobDone);
+        EvernoteConnection::instance()->enqueue(job);
+    }
 }
 
 void NotesStore::fetchNotebooksJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const std::vector<evernote::edam::Notebook> &results)