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

[Tiago Salem Herrmann]

Only mark messages as read when the application is active, and add a QML test to prevent regressions. The QML tests need some QML modules available at build time in order to run properly, so those were added as build deps.

Only mark messages as read when the application is active.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:404
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/609/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/122
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2861
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3432
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3432/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21894

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected!

review: Approve

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

405. By Tiago Salem Herrmann on 2015-08-13

add test for marking messages as read

406. By Tiago Salem Herrmann on 2015-08-13

invert logic

407. By Tiago Salem Herrmann on 2015-08-13

add missing dependency

408. By Tiago Salem Herrmann on 2015-08-14

add missing build deps

409. By Tiago Salem Herrmann on 2015-08-14

add missing build deps

410. By Tiago Salem Herrmann on 2015-08-14

add missing build deps

=== modified file 'debian/control'
--- debian/control	2015-06-10 13:17:17 +0000
+++ debian/control	2015-08-14 14:34:24 +0000
@@ -18,6 +18,11 @@
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
                qtdeclarative5-ubuntu-history0.1,
                qtdeclarative5-ubuntu-telephony-phonenumber0.1,
+               qtdeclarative5-ubuntu-telephony0.1 | qtdeclarative5-ubuntu-telephony-plugin,
+               qtdeclarative5-ubuntu-content1,
+               qtdeclarative5-ubuntu-addressbook0.1,
+               qtdeclarative5-qtcontacts-plugin,
+               qml-module-qt-labs-settings,
                qtpim5-dev,
                xvfb,
 Standards-Version: 3.9.4

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2015-07-10 19:24:13 +0000
+++ src/qml/Messages.qml	2015-08-14 14:34:24 +0000
@@ -52,6 +52,7 @@
     property string scrollToEventId: ""
     property bool isSearching: scrollToEventId !== ""
     property string latestEventId: ""
+    property var pendingEventsToMarkAsRead: []
     // to be used by tests as variant does not work with autopilot
     property string firstParticipant: participants.length > 0 ? participants[0] : ""
 
@@ -313,10 +314,28 @@
     }
 
     function markMessageAsRead(accountId, threadId, eventId, type) {
+        if (!mainView.applicationActive) {
+           var pendingEvent = {"accountId": accountId, "threadId": threadId, "eventId": eventId, "type": type}
+           pendingEventsToMarkAsRead.push(pendingEvent)
+           return false
+        }
         chatManager.acknowledgeMessage(participants, eventId, accountId)
         return eventModel.markEventAsRead(accountId, threadId, eventId, type);
     }
 
+    Connections {
+        target: mainView
+        onApplicationActiveChanged: {
+            if (mainView.applicationActive) {
+                for (var i in pendingEventsToMarkAsRead) {
+                    var event = pendingEventsToMarkAsRead[i]
+                    markMessageAsRead(event.accountId, event.threadId, event.eventId, event.type)
+                }
+                pendingEventsToMarkAsRead = []
+            }
+        }
+    }
+
     Component {
         id: attachmentPopover
 

=== modified file 'src/qml/messaging-app.qml'
--- src/qml/messaging-app.qml	2015-05-13 19:37:01 +0000
+++ src/qml/messaging-app.qml	2015-08-14 14:34:24 +0000
@@ -30,6 +30,7 @@
     property string newPhoneNumber
     property bool multipleAccounts: telepathyHelper.activeAccounts.length > 1
     property QtObject account: defaultAccount()
+    property bool applicationActive: Qt.application.active
 
     activeFocusOnPress: false
 

=== modified file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt	2014-08-01 14:12:20 +0000
+++ tests/qml/CMakeLists.txt	2015-08-14 14:34:24 +0000
@@ -17,6 +17,7 @@
 
 if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
     declare_qml_test("message_bubble" tst_MessageBubble.qml)
+    declare_qml_test("messages_view" tst_MessagesView.qml)
 else()
     if (NOT QMLTESTRUNNER_BIN)
         message(WARNING "Qml tests disabled: qmltestrunner not found")
@@ -27,5 +28,6 @@
 
 set(QML_TST_FILES
     tst_MessageBubble.qml
+    tst_MessagesView.qml
 )
 add_custom_target(tst_QmlFiles ALL SOURCES ${QML_TST_FILES})

=== added file 'tests/qml/tst_MessagesView.qml'
--- tests/qml/tst_MessagesView.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_MessagesView.qml	2015-08-14 14:34:24 +0000
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * messaging-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import QtTest 1.0
+import Ubuntu.Test 0.1
+import Ubuntu.Telephony 0.1
+import Ubuntu.History 0.1
+
+Item {
+    id: root
+
+    width: units.gu(40)
+    height: units.gu(70)
+
+
+    ListModel {
+        id: messagesModel
+        ListElement {
+            accountId: "ofono/ofono/account0"
+            threadId: "1234567"
+            participants: []
+            type: HistoryThreadModel.EventTypeText
+            properties: []
+            eventId: "id1"
+            senderId: "1234567"
+            timestamp: 1439486685400
+            date: ""
+            newEvent: true
+            textMessage: "test"
+            textMessageType: HistoryThreadModel.MessageTypeText
+            textMessageStatus: HistoryThreadModel.MessageStatusDelivered
+            textMessageAttachments: []
+            textReadTimestamp: 1439486685400
+            textSubject: ""
+            remoteParticipant: ""
+        }
+        ListElement {
+            accountId: "ofono/ofono/account0"
+            threadId: "1234567"
+            participants: []
+            type: HistoryThreadModel.EventTypeText
+            properties: []
+            eventId: "id2"
+            senderId: "1234567"
+            timestamp: 1439486685400
+            date: ""
+            newEvent: true
+            textMessage: "test2"
+            textMessageType: HistoryThreadModel.MessageTypeText
+            textMessageStatus: HistoryThreadModel.MessageStatusDelivered
+            textMessageAttachments: []
+            textReadTimestamp: 1439486685400
+            textSubject: ""
+            remoteParticipant: ""
+        }
+    }
+
+    QtObject {
+        id: testAccount
+        property string accountId: "ofono/ofono/account0"
+        property var emergencyNumbers: [ "444", "555"]
+        property int type: AccountEntry.PhoneAccount
+        property string displayName: "SIM 1"
+        property bool connected: true
+        property bool emergencyCallsAvailable: true
+        property bool active: true
+        property string networkName: "Network name"
+        property bool simLocked: false
+        property var addressableVCardFields: ["tel"]
+    }
+
+    Item {
+        id: telepathyHelper
+        function registerChannelObserver() {}
+        function unregisterChannelObserver() {}
+        property var activeAccounts: [testAccount]
+        property alias accounts: telepathyHelper.activeAccounts
+    }
+
+    Item {
+        id: chatManager
+        signal messageAcknowledged
+        function acknowledgeMessage(recipients, messageId, accountId) {
+            chatManager.messageAcknowledged(recipients, messageId, accountId)
+        }
+    }
+
+    Loader {
+        id: mainViewLoader
+        property string i18nDirectory: ""
+        source: '../../src/qml/messaging-app.qml'
+    }
+
+    SignalSpy {
+       id: messageAcknowledgeSpy
+       target: chatManager
+       signalName: "messageAcknowledged"
+    }
+
+    UbuntuTestCase {
+        id: swipeItemTestCase
+        name: 'swipeItemTestCase'
+
+        when: windowShown
+
+        function init() {
+        }
+
+        function cleanup() {
+        }
+
+        function test_messagesViewAcknowledgeMessage() {
+            var senderId = "1234567"
+            var stack = findChild(mainViewLoader, "mainStack")
+            tryCompare(mainViewLoader.item, 'applicationActive', true)
+            tryCompare(stack, 'depth', 1)
+            mainViewLoader.item.startChat(senderId, "")
+            tryCompare(stack, 'depth', 2)
+            mainViewLoader.item.applicationActive = false
+            var messageList = findChild(mainViewLoader, "messageList")
+            messageList.listModel = messagesModel
+            tryCompare(messageList, 'count', 2)
+            compare(messageAcknowledgeSpy.count, 0)
+            mainViewLoader.item.applicationActive = true
+            tryCompare(messageAcknowledgeSpy, 'count', 2)
+        }
+    }
+}