Merge lp:~renatofilho/address-book-app/fix-search-crash into lp:~phablet-team/address-book-app/staging

[Renato Araujo Oliveira Filho]

Fixed app crash wen starting the searching from favorite mode.

[lp:~renatofilho/address-book-app/fix-search-crash]

215. By Renato Araujo Oliveira Filho on 2014-07-09

Clear the model for every new search.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:214
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/219/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1774
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1490
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/219
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2034
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2838
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2838/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9569
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1673
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1673/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/219/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO PACKAGE CHANGE

[Tiago Salem Herrmann (tiagosh)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:215
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/220/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1777
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1493
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/220
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/220/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/220
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2038
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2844
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2844/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9575
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1678
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1678/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/220/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-07-07 19:46:23 +0000
+++ click/manifest.json.in	2014-07-09 22:25:14 +0000
@@ -18,4 +18,4 @@
         "vcs-bzr": "lp:address-book-app",
         "vcs-bzr-revno": "@BZR_REVNO@"
     }
-}
+}
 \ No newline at end of file
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-07-03 19:35:30 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-07-09 22:25:14 +0000
@@ -373,6 +373,14 @@
                 return tag
         }
 
+        // if the favorite header became invisible we should move back to all contacts.
+        onShowFavouritesChanged: {
+            if (!showFavourites && view.favouritesIsSelected) {
+                root.changeFilter(root.filter)
+                view.favouritesIsSelected = false
+            }
+        }
+
         anchors {
             top: itemHeader.bottom
             left: parent.left
@@ -523,22 +531,31 @@
         IntersectionFilter {
             id: contactsFilter
 
-            property bool active: false
-
-            filters: {
-                var filters = []
+            property bool active: {
+                var filters_ = []
                 if (contactTermFilter.value.length > 0) {
-                    filters.push(contactTermFilter)
-                } else if (view.showFavourites && view.favouritesIsSelected) {
-                    filters.push(favouritesFilter)
+                    filters_.push(contactTermFilter)
+                } else if (view.favouritesIsSelected) {
+                    filters_.push(favouritesFilter)
                 }
 
                 if (root.filter) {
-                    filters.push(root.filter)
-                }
-
-                active = (filters.length > 0)
-                return filters
+                    filters_.push(root.filter)
+                }
+
+                // check if the filter has changed
+                var oldFilters = contactsFilter.filters
+                if (oldFilters.length !== filters_.length) {
+                    contactsFilter.filters = filters_
+                } else {
+                    for(var i=0; i < oldFilters.length; i++) {
+                        if (filters_.indexOf(oldFilters[i]) === -1) {
+                            contactsFilter.filters = filters_
+                        }
+                    }
+                }
+
+                return (filters_.length > 0)
             }
         }
 
@@ -550,25 +567,12 @@
             interval: 300
             onTriggered: {
                 view.positionViewAtBeginning()
-                var needUpdate = false
-                if (root.filterTerm === "") { // if the search criteria is empty clear the list before show all contacts
-                    if (contactTermFilter.value !== "") {
-                        root.changeFilter(root.filter)
-                        contactTermFilter.value = ""
-                        needUpdate = true
-                    }
-                } else {
-                    if (contactTermFilter.value !== root.filterTerm) {
-                        if (contactTermFilter.value === "") { // if the search starts clear the list before show results
-                            root.changeFilter(root.filter)
-                        }
-                        contactTermFilter.value = root.filterTerm
-                        needUpdate = true
-                    }
-                }
+
+                root.changeFilter(root.filter)
+                contactTermFilter.value = root.filterTerm
 
                 // manually update if autoUpdate is disabled
-                if (needUpdate && !root.autoUpdate) {
+                if (!root.autoUpdate) {
                     contactsModel.update()
                 }
             }