Merge lp:~mzanetti/reminders-app/fix-save-unloaded into lp:reminders-app

[Michael Zanetti]

Fix an issue where a note can be saved to the server without its content

Sometimes it happens that a newly created note can't be created on the server. For example because the network connection breaks down. If the app is restarted before that recovered and synced, after restart, the note is synced to the server without loading it's content from the cache first.

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

PASSED: Continuous integration, rev:351
http://91.189.93.70:8080/job/reminders-app-ci/670/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2112
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2112/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/91

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgtm, thanks!

review: Approve

=== modified file 'src/libqtevernote/note.cpp'
--- src/libqtevernote/note.cpp	2015-02-24 22:21:04 +0000
+++ src/libqtevernote/note.cpp	2015-02-25 21:19:39 +0000
@@ -75,6 +75,8 @@
 
     connect(NotesStore::instance(), &NotesStore::notebookGuidChanged, this, &Note::slotNotebookGuidChanged);
     connect(NotesStore::instance(), &NotesStore::tagGuidChanged, this, &Note::slotTagGuidChanged);
+
+    qDebug() << "Note created:" << m_guid << m_title << m_tagline << m_content.enml();
 }
 
 Note::~Note()
@@ -585,6 +587,11 @@
     return m_cacheFile.exists();
 }
 
+bool Note::loaded() const
+{
+    return m_loaded;
+}
+
 void Note::save()
 {
     NotesStore::instance()->saveNote(m_guid);
@@ -649,10 +656,12 @@
 
 void Note::loadFromCacheFile() const
 {
+    qDebug() << "Loading from cacheFile:" << m_guid;
     if (m_cacheFile.exists() && m_cacheFile.open(QFile::ReadOnly)) {
         m_content.setEnml(QString::fromUtf8(m_cacheFile.readAll()).trimmed());
         m_tagline = m_content.toPlaintext().left(100);
         m_cacheFile.close();
+        qDebug() << "cache file opened" << m_tagline;
     }
     m_loaded = true;
 }
 
=== modified file 'src/libqtevernote/note.h'
--- src/libqtevernote/note.h	2015-02-16 19:28:02 +0000
+++ src/libqtevernote/note.h	2015-02-25 21:19:39 +0000
@@ -61,7 +61,7 @@
     Q_PROPERTY(quint32 updateSequenceNumber READ updateSequenceNumber NOTIFY updateSequenceNumberChanged)
     Q_PROPERTY(bool deleted READ deleted NOTIFY deletedChanged)
     Q_PROPERTY(bool conflicting READ conflicting NOTIFY conflictingChanged)
-//    Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
+    Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
     // Don't forget to update clone() if you add properties!
 
     // Don't clone() "loading" property as results of any current loading operation won't affect the clone.
@@ -142,6 +142,7 @@
     quint32 lastSyncedSequenceNumber() const;
 
     bool isCached() const;
+    bool loaded() const;
     bool loading() const;
     bool synced() const;
     bool syncError() const;
 
=== modified file 'src/libqtevernote/notesstore.cpp'
--- src/libqtevernote/notesstore.cpp	2015-02-24 18:55:55 +0000
+++ src/libqtevernote/notesstore.cpp	2015-02-25 21:19:39 +0000
@@ -611,6 +611,12 @@
             // Local note changed. See if we can push our changes.
             if (note->lastSyncedSequenceNumber() == result.updateSequenceNum) {
                 qDebug() << "Local note" << note->guid() << "has changed while server note did not. Pushing changes.";
+
+                // Make sure we have everything loaded from cache before saving to server
+                if (!note->loaded() && note->isCached()) {
+                    note->loadFromCacheFile();
+                }
+
                 note->setLoading(true);
                 changedRoles << RoleLoading;
                 SaveNoteJob *job = new SaveNoteJob(note, this);
@@ -674,7 +680,12 @@
                     qDebug() << "Not syncing note to server yet. The notebook needs to be synced first";
                     continue;
                 }
-                qDebug() << "Creating note on server:" << note->notebookGuid() << m_notebooksHash.keys();
+                qDebug() << "Creating note on server:" << note->guid();
+
+                // Make sure we have everything loaded from cache before saving to server
+                if (!note->loaded() && note->isCached()) {
+                    note->loadFromCacheFile();
+                }
 
                 QModelIndex idx = index(m_notes.indexOf(note));
                 note->setLoading(true);
@@ -1092,7 +1103,7 @@
     roles << RoleLoading;
 
     if (errorCode != EvernoteConnection::ErrorCodeNoError) {
-        qWarning() << "Error creating note:" << errorMessage;
+        qWarning() << "Error creating note:" << tmpGuid << errorMessage;
         note->setSyncError(true);
         roles << RoleSyncError;
         emit dataChanged(index(idx), index(idx), roles);
@@ -1105,6 +1116,7 @@
     }
 
     QString guid = QString::fromStdString(result.guid);
+    qDebug() << "Note created on server. Old guid:" << tmpGuid << "New guid:" << guid;
     m_notesHash.insert(guid, note);
     note->setGuid(guid);
     m_notesHash.remove(tmpGuid);