Merge lp:~mzanetti/reminders-app/fix-search into lp:reminders-app

[Michael Zanetti]

some more fixes for search

* fix actions invoked from search page
* make note page work from everywhere
* make search work in offline mode
* properly reset the search when needed

[lp:~mzanetti/reminders-app/fix-search]

375. By Michael Zanetti on 2015-03-04

make search work in offline mode

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

PASSED: Continuous integration, rev:374
http://91.189.93.70:8080/job/reminders-app-ci/695/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2242
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2242/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/297
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/116

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:375
http://91.189.93.70:8080/job/reminders-app-ci/696/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2244
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/298
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/117

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgtm

review: Approve

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2015-03-04 14:31:29 +0000
+++ src/app/qml/reminders.qml	2015-03-04 23:25:12 +0000
@@ -149,6 +149,7 @@
         var page = component.createObject();
         pagestack.push(page)
         page.noteSelected.connect(function(note) {root.displayNote(note)})
+        page.editNote.connect(function(note) {root.switchToEditMode(note)})
     }
 
     function doLogin() {
@@ -502,6 +503,9 @@
                         page.editNote.connect(function(note) {
                             root.switchToEditMode(note)
                         })
+                        page.openSearch.connect(function() {
+                            root.openSearch();
+                        })
                         NotesStore.refreshNotes();
                     }
 

=== modified file 'src/app/qml/ui/SearchNotesPage.qml'
--- src/app/qml/ui/SearchNotesPage.qml	2015-02-28 01:43:49 +0000
+++ src/app/qml/ui/SearchNotesPage.qml	2015-03-04 23:25:12 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.3
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.Popups 1.0
 import Evernote 0.1
 import "../components"
 
@@ -26,6 +27,7 @@
     id: root
 
     signal noteSelected(var note)
+    signal editNote(var note)
 
     title: i18n.tr("Search notes")
 
@@ -49,7 +51,7 @@
                 }
 
                 onAccepted: {
-                    NotesStore.findNotes(searchField.text + "*")
+                    NotesStore.findNotes(searchField.text)
                 }
             }
             Button {
@@ -57,7 +59,7 @@
                 height: searchField.height
                 text: i18n.tr("Search")
                 onClicked: {
-                    NotesStore.findNotes(searchField.text + "*")
+                    NotesStore.findNotes(searchField.text)
                 }
             }
         }
@@ -69,6 +71,12 @@
 
             model: Notes {
                 onlySearchResults: true
+
+                Component.onCompleted: {
+                    if (count > 0) {
+                        NotesStore.clearSearchResults();
+                    }
+                }
             }
 
             delegate: NotesDelegate {
@@ -105,8 +113,9 @@
                     pageStack.push(Qt.resolvedUrl("SetReminderPage.qml"), { note: NotesStore.note(model.guid) });
                 }
                 onEditTags: {
-                    PopupUtils.open(Qt.resolvedUrl("../components/EditTagsDialog.qml"), root,
+                    var popup = PopupUtils.open(Qt.resolvedUrl("../components/EditTagsDialog.qml"), root,
                                     { note: NotesStore.note(model.guid), pageHeight: root.height });
+                    popup.done.connect(function() { NotesStore.saveNote(popup.note.guid)})
                 }
             }
         }

=== modified file 'src/libqtevernote/notesstore.cpp'
--- src/libqtevernote/notesstore.cpp	2015-03-04 20:30:55 +0000
+++ src/libqtevernote/notesstore.cpp	2015-03-04 23:25:12 +0000
@@ -1374,14 +1374,19 @@
 
 void NotesStore::findNotes(const QString &searchWords)
 {
-    foreach (Note *note, m_notes) {
-        note->setIsSearchResult(false);
+    if (EvernoteConnection::instance()->isConnected()) {
+        clearSearchResults();
+        FetchNotesJob *job = new FetchNotesJob(QString(), searchWords + "*");
+        connect(job, &FetchNotesJob::jobDone, this, &NotesStore::fetchNotesJobDone);
+        EvernoteConnection::instance()->enqueue(job);
+    } else {
+        foreach (Note *note, m_notes) {
+            bool matches = note->title().contains(searchWords, Qt::CaseInsensitive);
+            matches |= note->plaintextContent().contains(searchWords, Qt::CaseInsensitive);
+            note->setIsSearchResult(matches);
+        }
+        emit dataChanged(index(0), index(m_notes.count()-1), QVector<int>() << RoleIsSearchResult);
     }
-    emit dataChanged(index(0), index(m_notes.count()), QVector<int>() << RoleIsSearchResult);
-
-    FetchNotesJob *job = new FetchNotesJob(QString(), searchWords);
-    connect(job, &FetchNotesJob::jobDone, this, &NotesStore::fetchNotesJobDone);
-    EvernoteConnection::instance()->enqueue(job);
 }
 
 void NotesStore::clearSearchResults()