Merge lp:~tiagosh/messaging-app/fix-1414675 into lp:messaging-app

[Tiago Salem Herrmann]

Generate filters dynamically using a UnionFilter with all grouped threads.

Generate filters dynamically using a UnionFilter with all grouped threads.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
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 (https://wiki.ubuntu.com/Process/Merges/TestPlan/messaging-app) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:297
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/510/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/993
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/23
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/879
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/991
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/991/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17458
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/379
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/564
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/564/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/510/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

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.
No, but not related to the changes

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

Code looks good and works as expected!

review: Approve

[lp:~tiagosh/messaging-app/fix-1414675]

298. By Tiago Salem Herrmann on 2015-01-27

change filters to make it more reliable

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:298
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/511/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1024/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/476/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/24
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/904/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1022
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1022/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17512
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/581/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/511/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/qml/ThreadDelegate.qml'
--- src/qml/ThreadDelegate.qml	2015-01-21 13:21:45 +0000
+++ src/qml/ThreadDelegate.qml	2015-01-27 13:50:23 +0000
@@ -218,11 +218,18 @@
         property alias contexts: phoneDetail.contexts
         property bool isUnknown: contactId === ""
         property string phoneNumberSubTypeLabel: ""
-        property var searchHistoryFilter: HistoryIntersectionFilter {
-            HistoryFilter { filterProperty: "threadId"; filterValue: model.threadId }
-            HistoryFilter { filterProperty: "accountId"; filterValue: model.accountId }
+        property string latestFilter: ""
+        property var searchHistoryFilter
+        property var searchHistoryFilterString: 'import Ubuntu.History 0.1; 
+            HistoryUnionFilter { 
+                %1 
+            }'
+        property var searchIntersectionFilter: 'HistoryIntersectionFilter {
+            HistoryFilter { filterProperty: "accountId"; filterValue: \'%1\' }
+            HistoryFilter { filterProperty: "threadId"; filterValue: \'%2\' }
             HistoryFilter { filterProperty: "message"; filterValue: searchTerm; matchFlags: HistoryFilter.MatchContains }
         }
+        '
 
         function updateSearch() {
             var found = false
@@ -232,6 +239,16 @@
                 || (!unknownContact && delegateHelper.alias.toLowerCase().search(searchTermLowerCase) !== -1)) {
                     found = true
                 } else {
+                    var componentFilters = ""
+                    for(var i in model.threads) {
+                        componentFilters += searchIntersectionFilter.arg(model.threads[i].accountId).arg(model.threads[i].threadId)
+                    }
+                    var finalString = searchHistoryFilterString.arg(componentFilters)
+                    if (finalString !== latestFilter) {
+                        delegateHelper.searchHistoryFilter = Qt.createQmlObject(finalString, searchEventModelLoader)
+                        latestFilter = finalString
+                    }
+ 
                     searchEventModelLoader.active = true
                 }
             } else {