Merge lp:~tiagosh/messaging-app/updateFilters-binding into lp:messaging-app

[Tiago Salem Herrmann]

Turn updateFilters() into a binding.

Turn updateFilters() into a binding.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:429
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/638/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3892
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/151
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3889
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3889/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22883

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected!

review: Approve

[lp:~tiagosh/messaging-app/updateFilters-binding]

430. By Tiago Salem Herrmann on 2015-09-28

merge trunk

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2015-09-21 19:56:31 +0000
+++ src/qml/Messages.qml	2015-09-28 21:00:49 +0000
@@ -47,12 +47,12 @@
     property int activeAttachmentIndex: -1
     property var sharedAttachmentsTransfer: []
     property alias contactWatcher: contactWatcherInternal
-    property string lastFilter: ""
     property string text: ""
     property string scrollToEventId: ""
     property bool isSearching: scrollToEventId !== ""
     property string latestEventId: ""
     property var pendingEventsToMarkAsRead: []
+    property bool reloadFilters: false
     // to be used by tests as variant does not work with autopilot
     property string firstParticipant: participants.length > 0 ? participants[0] : ""
 
@@ -213,11 +213,6 @@
         onAccountChanged: messages.account = mainView.account
     }
 
-    Connections {
-        target: telepathyHelper
-        onAccountsChanged: updateFilters()
-    }
-
     ActivityIndicator {
         id: activityIndicator
         anchors {
@@ -277,7 +272,6 @@
     }
 
     Component.onCompleted: {
-        updateFilters()
         addAttachmentsToModel(sharedAttachmentsTransfer)
     }
 
@@ -287,16 +281,15 @@
         }
     }
 
-    function updateFilters() {
-        if (participants.length == 0) {
-            eventModel.filter = null
-            return
+    function updateFilters(accounts, participants, reload) {
+        if (participants.length == 0 || accounts.length == 0) {
+            return null
         }
 
         var componentUnion = "import Ubuntu.History 0.1; HistoryUnionFilter { %1 }"
         var componentFilters = ""
-        for (var i in telepathyHelper.accounts) {
-            var account = telepathyHelper.accounts[i];
+        for (var i in accounts) {
+            var account = accounts[i];
             var filterValue = eventModel.threadIdForParticipants(account.accountId,
                                                                  HistoryThreadModel.EventTypeText,
                                                                  participants,
@@ -310,15 +303,9 @@
             componentFilters += 'HistoryFilter { property string value: "%1"; filterProperty: "threadId"; filterValue: value } '.arg(filterValue)
         }
         if (componentFilters === "") {
-            eventModel.filter = null
-            lastFilter = ""
-            return
-        }
-        if (componentFilters != lastFilter) {
-            var finalString = componentUnion.arg(componentFilters)
-            eventModel.filter = Qt.createQmlObject(finalString, eventModel)
-            lastFilter = componentFilters
-        }
+            return null
+        }
+        return Qt.createQmlObject(componentUnion.arg(componentFilters), eventModel)
     }
 
     function markMessageAsRead(accountId, threadId, eventId, type) {
@@ -522,10 +509,6 @@
         addressableFields: messages.account ? messages.account.addressableVCardFields : ["tel"] // just to have a fallback there
     }
 
-    onParticipantsChanged: {
-        updateFilters()
-    }
-
     Action {
         id: backButton
         objectName: "backButton"
@@ -676,7 +659,7 @@
     HistoryEventModel {
         id: eventModel
         type: HistoryThreadModel.EventTypeText
-        filter: null
+        filter: updateFilters(telepathyHelper.accounts, messages.participants, messages.reloadFilters)
         sort: HistorySort {
            sortField: "timestamp"
            sortOrder: HistorySort.DescendingOrder
@@ -1080,7 +1063,9 @@
                         textEntry.text = ""
                         attachments.clear()
                     }
-                    updateFilters()
+                    if (eventModel.filter == null) {
+                        reloadFilters = !reloadFilters
+                    }
                 }
             }
         }