Merge lp:~mzanetti/reminders-app/prefetch-notes into lp:reminders-app

[Michael Zanetti]

prefetch notes content when they become visible in the NotesPage.

Also fixes an issue with the NotePage listening for the wrong note refreshed signals

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

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

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgfm

review: Approve

=== modified file 'src/app/qml/ui/NotePage.qml'
--- src/app/qml/ui/NotePage.qml	2014-02-01 19:19:13 +0000
+++ src/app/qml/ui/NotePage.qml	2014-02-05 13:27:39 +0000
@@ -28,15 +28,26 @@
     id: root
     title: note.title
     property var note
-    property bool noteReady: false
+
+    QtObject {
+        id: priv
+        property bool loading: false
+    }
 
     Component.onCompleted: {
-        noteReady=false;
-        NotesStore.refreshNoteContent(note.guid)
+        if (note.enmlContent.length === 0) {
+            NotesStore.refreshNoteContent(root.note.guid)
+            priv.loading = true;
+        }
     }
-    Connections{ //set noteReady when note is fetched
+
+    Connections {
         target: NotesStore
-        onNoteChanged: noteReady=true;
+        onNoteChanged: {
+            if (guid === root.note.guid) {
+                priv.loading = false;
+            }
+        }
     }
 
     tools: ToolbarItems {
@@ -68,18 +79,18 @@
     }
 
     ActivityIndicator {
-        id: activityIndicator
-        running: !noteReady
+        anchors.centerIn: parent
+        running: priv.loading
         visible: running
-        anchors.centerIn: parent
     }
+
     // FIXME: This is a workaround for an issue in the WebView. For some reason certain
     // documents cause a binding loop in the webview's contentHeight. Wrapping it inside
     // another flickable prevents this from happening.
     Flickable {
-        visible: noteReady
-        anchors { fill: parent}
+        anchors { fill: parent }
         contentHeight: height
+        visible: !priv.loading
 
         UbuntuWebView {
             id: noteTextArea
 
=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2014-01-28 08:31:37 +0000
+++ src/app/qml/ui/NotesPage.qml	2014-02-05 13:27:39 +0000
@@ -70,6 +70,8 @@
             content: model.plaintextContent
             resource: model.resourceUrls.length > 0 ? model.resourceUrls[0] : ""
 
+            Component.onCompleted: NotesStore.refreshNoteContent(model.guid)
+
             onClicked: {
                 pageStack.push(Qt.resolvedUrl("NotePage.qml"), {note: NotesStore.note(guid)})
             }