Merge lp:~tiagosh/messaging-app/fix-sections-dualsim into lp:messaging-app

[Tiago Salem Herrmann]

Do not use bindings on sections model to avoid the index getting reset.

Do not use bindings on sections model to avoid the index getting reset.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:551
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/995/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6892/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/504/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6903/console

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/fix-sections-dualsim]

552. By Tiago Salem Herrmann on 2016-05-02

add qml test

553. By Tiago Salem Herrmann on 2016-05-02

add missing copyright headers

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:552
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/996/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6897/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/505/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6908/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:553
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/997/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6898/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/506/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6909/console

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/fix-sections-dualsim]

554. By Tiago Salem Herrmann on 2016-05-02

dismiss swipe demo if displayed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:554
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/998/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6899/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/507/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6910/console

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/fix-sections-dualsim]

555. By Tiago Salem Herrmann on 2016-05-02

fix tests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:555
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/999/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6900
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/508
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6911
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6911/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28151

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'src/qml/EmptyState.qml'
--- src/qml/EmptyState.qml	2016-01-15 19:56:29 +0000
+++ src/qml/EmptyState.qml	2016-05-02 22:45:26 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2016 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.0
 import Ubuntu.Components 1.3
 

=== modified file 'src/qml/InputInfo.qml'
--- src/qml/InputInfo.qml	2016-01-21 20:25:20 +0000
+++ src/qml/InputInfo.qml	2016-05-02 22:45:26 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2016 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.0
 //import Unity.InputInfo 0.1
 

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2016-03-17 21:10:15 +0000
+++ src/qml/Messages.qml	2016-05-02 22:45:26 +0000
@@ -67,6 +67,7 @@
     property string firstRecipientAlias: ((contactWatcher.isUnknown &&
                                            contactWatcher.isInteractive) ||
                                           contactWatcher.alias === "") ? contactWatcher.identifier : contactWatcher.alias
+    property bool newMessage: false
 
     // When using this view from the bottom edge, we are not in the stack, so we need to push on top of the parent page
     property var basePage: messages
@@ -76,10 +77,16 @@
     signal ready
     signal cancel
 
+    function restoreBindings() {
+        messages.account = Qt.binding(getCurrentAccount)
+        messages.phoneAccount = Qt.binding(isPhoneAccount)
+        headerSections.selectedIndex = Qt.binding(getSelectedIndex)
+    }
+
     function getAccountsModel() {
         var accounts = []
         // on new chat dialogs display all possible accounts
-        if (accountId == "" && participants.length === 0) {
+        if (newMessage) {
             for (var i in telepathyHelper.activeAccounts) {
                 accounts.push(telepathyHelper.activeAccounts[i])
             }
@@ -123,7 +130,7 @@
     }
 
     function getSelectedIndex() {
-        if (accountId == "" && participants.length === 0) {
+        if (newMessage) {
             // if this is a new message, just pre select the the 
             // default phone account for messages if available
             if (multiplePhoneAccounts && telepathyHelper.defaultMessagingAccount) {
@@ -339,7 +346,7 @@
             }
             eventModel.writeEvents([event]);
         } else {
-            var isMmsGroupChat = participants.length > 1 && telepathyHelper.mmsGroupChat && messages.account.type == AccountEntry.PhoneAccount
+            var isMmsGroupChat = participantIds.length > 1 && telepathyHelper.mmsGroupChat && messages.account.type == AccountEntry.PhoneAccount
             // mms group chat only works if we know our own phone number
             var isSelfContactKnown = account.selfContactId != ""
             if (isMmsGroupChat && !isSelfContactKnown) {
@@ -354,6 +361,14 @@
             }
         }
 
+        if (newMessage) {
+            newMessage = false
+            var currentIndex = headerSections.selectedIndex
+            headerSections.model = getSectionsModel()
+            restoreBindings()
+            headerSections.selectedIndex = currentIndex
+        }
+
         // FIXME: soon it won't be just about SIM cards, so the dialogs need updating
         if (multiplePhoneAccounts && !telepathyHelper.defaultMessagingAccount && !settings.messagesDontAsk && account.type == AccountEntry.PhoneAccount) {
             Qt.inputMethod.hide()
@@ -491,6 +506,8 @@
                     messages.account = messages.accountsModel[selectedIndex]
                 }
             }
+            // force break the binding, so the index doesn't get reset
+            Component.onCompleted: model = getSectionsModel()
         }
 
         extension: headerSections.model.length > 1 ? headerSections : null
@@ -635,7 +652,7 @@
             // NOTE: in case the state name is changed here, the bottom edge component needs
             // to be updated too
             name: "newMessage"
-            when: participants.length === 0
+            when: messages.newMessage
 
             property list<QtObject> trailingActions: [
                 Action {
@@ -722,6 +739,8 @@
                 }
             }
         }
+        newMessage = (messages.accountId == "" && messages.participants.length === 0)
+        restoreBindings()
         // if we add multiple attachments at the same time, it break the Repeater + Loaders
         fillAttachmentsTimer.start()
     }
@@ -759,10 +778,8 @@
         target: telepathyHelper
         onSetupReady: {
             // force reevaluation
-            messages.account = Qt.binding(getCurrentAccount)
-            messages.phoneAccount = Qt.binding(isPhoneAccount)
-            headerSections.model = Qt.binding(getSectionsModel)
-            headerSections.selectedIndex = Qt.binding(getSelectedIndex)
+            headerSections.model = getSectionsModel()
+            restoreBindings()
         }
     }
 
@@ -1157,7 +1174,6 @@
 
             if (messages.account && messages.accountId == "") {
                 messages.accountId = messages.account.accountId
-                headerSections.selectedIndex = Qt.binding(getSelectedIndex)
             }
 
             var newAttachments = []

=== modified file 'src/qml/MessagingBottomEdge.qml'
--- src/qml/MessagingBottomEdge.qml	2016-02-25 23:43:42 +0000
+++ src/qml/MessagingBottomEdge.qml	2016-05-02 22:45:26 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2016 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.0
 import Ubuntu.Components 1.3
 

=== modified file 'src/qml/MessagingPageLayout.qml'
--- src/qml/MessagingPageLayout.qml	2016-03-17 21:06:41 +0000
+++ src/qml/MessagingPageLayout.qml	2016-05-02 22:45:26 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2016 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.0
 import Ubuntu.Components 1.3
 

=== modified file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt	2016-01-19 17:44:27 +0000
+++ tests/qml/CMakeLists.txt	2016-05-02 22:45:26 +0000
@@ -28,16 +28,21 @@
 add_executable(${TEST} ${SOURCES})
 qt5_use_modules(${TEST} Core Multimedia Qml Quick QuickTest Sql)
 
+set(TEST_COMMAND ${XVFB_COMMAND} ${CMAKE_CURRENT_BINARY_DIR}/${TEST}
+                 -import ${CMAKE_BINARY_DIR}/src
+                 -import ${UNITY8_QML_PATH})
+
 include_directories(
     ${messaging-app_SOURCE_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_test(${TEST} ${XVFB_COMMAND} ${CMAKE_CURRENT_BINARY_DIR}/${TEST}
-         -input ${CMAKE_CURRENT_SOURCE_DIR}
-         -import ${CMAKE_BINARY_DIR}/src
-         -import ${UNITY8_QML_PATH})
+add_test(DualSim ${TEST_COMMAND} -input ${CMAKE_CURRENT_SOURCE_DIR}/tst_DualSim.qml)
+add_test(MessageBubble ${TEST_COMMAND} -input ${CMAKE_CURRENT_SOURCE_DIR}/tst_MessageBubble.qml)
+add_test(MessagesView ${TEST_COMMAND} -input ${CMAKE_CURRENT_SOURCE_DIR}/tst_MessagesView.qml)
+add_test(MMSDelegate ${TEST_COMMAND} -input ${CMAKE_CURRENT_SOURCE_DIR}/tst_MMSDelegate.qml)
+add_test(StickersHistoryModel ${TEST_COMMAND} -input ${CMAKE_CURRENT_SOURCE_DIR}/tst_StickersHistoryModel.qml)
 
 # make qml files visible in QtCreator
 file(GLOB_RECURSE NON_COMPILED_FILES *.qml)

=== added file 'tests/qml/tst_DualSim.qml'
--- tests/qml/tst_DualSim.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_DualSim.qml	2016-05-02 22:45:26 +0000
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2016 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)
+
+
+    Item {
+        id: application
+        function findMessagingChild(name)
+        {
+            return null
+        }
+    }
+
+    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"]
+    }
+
+    QtObject {
+        id: testAccount2
+        property string accountId: "ofono/ofono/account1"
+        property var emergencyNumbers: [ "444", "555"]
+        property int type: AccountEntry.PhoneAccount
+        property string displayName: "SIM 2"
+        property bool connected: true
+        property bool emergencyCallsAvailable: true
+        property bool active: true
+        property string networkName: "Network name 2"
+        property bool simLocked: false
+        property var addressableVCardFields: ["tel"]
+    }
+
+    Item {
+        id: telepathyHelper
+        property var activeAccounts: [testAccount, testAccount2]
+        property alias accounts: telepathyHelper.activeAccounts
+        property QtObject defaultMessagingAccount: testAccount2
+        function registerChannelObserver() {}
+        function unregisterChannelObserver() {}
+        function accountForId(accountId) {
+            for (var i in accounts) {
+               if (accounts[i].accountId == accountId) {
+                  return accounts[i]
+               }
+            }
+            return null
+        }
+    }
+
+    Item {
+        id: chatManager
+        signal messageSent(string accountId, var participantIds, string text, var attachments, var properties)
+        function acknowledgeMessage(recipients, messageId, accountId) {
+            chatManager.messageAcknowledged(recipients, messageId, accountId)
+        }
+        function sendMessage(accountId, participantIds, text, attachments, properties) {
+           chatManager.messageSent(accountId, participantIds, text, attachments, properties)
+           return accountId
+        }
+        function chatEntryForParticipants(accountId, participantIds) {
+            return null
+        }
+    }
+
+    Loader {
+        id: mainViewLoader
+        property string i18nDirectory: ""
+        source: '../../src/qml/messaging-app.qml'
+    }
+
+    SignalSpy {
+       id: messageSentSpy
+       target: chatManager
+       signalName: "messageSent"
+    }
+
+    UbuntuTestCase {
+        id: dualSim
+        name: 'dualSim'
+
+        when: windowShown
+
+        // we reimplement the function here and add a special
+        // case to deal with a null child without failing
+        function findChild(obj,objectName) {
+            var childs = new Array(0);
+            childs.push(obj)
+            while (childs.length > 0) {
+                // this is the special case
+                if (!childs[0]) {
+                    childs.splice(0, 1);
+                    continue
+                }
+                if (childs[0].objectName == objectName) {
+                    return childs[0]
+                }
+                for (var i in childs[0].children) {
+                    childs.push(childs[0].children[i])
+                }
+                childs.splice(0, 1);
+            }
+            return null;
+        }
+
+        function init() {
+        }
+
+        function cleanup() {
+        }
+
+        function test_dualSim() {
+            tryCompare(mainViewLoader.item, 'applicationActive', true)
+
+            mainViewLoader.item.startNewMessage()
+            wait(1000)
+
+            var messagesView = findChild(mainViewLoader, "messagesPage")
+            var textArea = findChild(messagesView, "messageTextArea")
+            var contactSearchInput = findChild(messagesView, "contactSearchInput")
+            var sendButton = findChild(messagesView, "sendButton")
+            contactSearchInput.text = "123"
+            textArea.text = "test text"
+            // on vivid mouseClick() does not work here
+            sendButton.clicked()
+            tryCompare(messageSentSpy, 'count', 1)
+            tryCompare(telepathyHelper.defaultMessagingAccount, 'accountId', messageSentSpy.signalArguments[0][0])
+        }
+    }
+}