Merge lp:~tiagosh/messaging-app/update-sim-dialogs into lp:messaging-app

[Tiago Salem Herrmann]

Update SIM dialogs according to design spec.

Update SIM dialogs according to design spec.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:426
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/617/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/130
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3004
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3634
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3634/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22434

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/update-sim-dialogs]

427. By Tiago Salem Herrmann on 2015-08-10

merge parent branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:427
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/618/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3642
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/131
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3008
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3639
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3639/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22440

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/update-sim-dialogs]

428. By Tiago Salem Herrmann on 2015-08-11

set x-canonical-tmp-files when resending mms

429. By Tiago Salem Herrmann on 2015-08-11

fix conflict

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:428
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/622/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3657
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/135
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3022
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3654
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3654/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22480

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:429
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/623/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3659
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/136
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3024
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3656
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3656/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22483

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/update-sim-dialogs]

430. By Tiago Salem Herrmann on 2015-08-11

merge parent branch

431. By Tiago Salem Herrmann on 2015-08-11

merge parent branch

432. By Tiago Salem Herrmann on 2015-08-11

merge parent branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:432
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/624/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3664
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/137
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3029
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3661
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3661/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22493

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/update-sim-dialogs]

433. By Tiago Salem Herrmann on 2015-08-18

merge parrent branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:433
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/634/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3786/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/147/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3783/console

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/update-sim-dialogs]

434. By Tiago Salem Herrmann on 2015-10-09

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:434
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/670/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4591/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/183/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4588/console

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/update-sim-dialogs]

435. By Tiago Salem Herrmann on 2015-10-30

Merge parent branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:435
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/684/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4947/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/197/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4944/console

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/update-sim-dialogs]

436. By Tiago Salem Herrmann on 2015-11-03

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:436
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/686/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4996/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/199/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4993/console

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/update-sim-dialogs]

437. By Tiago Salem Herrmann on 2015-11-05

merge parent branch

438. By Tiago Salem Herrmann on 2015-11-05

fix header in group chats

439. By Tiago Salem Herrmann on 2015-11-05

dont create threads on startChat()

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:437
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/694/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5037/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/207/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5034/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/697/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5058/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/210/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5061/console

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Just one inline comment for now.

review: Needs Fixing

[lp:~tiagosh/messaging-app/update-sim-dialogs]

440. By Tiago Salem Herrmann on 2015-11-13

merge parent branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:440
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/701/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5146/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/214/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5160/console

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/update-sim-dialogs]

441. By Tiago Salem Herrmann on 2015-11-18

merge parent branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:441
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/725/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5247/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/238/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5267/console

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/update-sim-dialogs]

442. By Tiago Salem Herrmann on 2015-11-19

Reenable default sim card watcher

[Gustavo Pichorim Boiko (boiko)]

Looks good now!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:441
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/731/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5268/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/244/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5288/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/qml/Dialogs/NoDefaultSIMCardDialog.qml'
--- src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2015-09-14 13:51:27 +0000
+++ src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2015-11-19 16:17:37 +0000
@@ -24,66 +24,32 @@
 Component {
     Dialog {
         id: dialogue
-        title: i18n.tr("Switch to default SIM:")
+        title: i18n.tr("Welcome to your Messaging app!")
         Column {
             anchors.left: parent.left
             anchors.right: parent.right
             spacing: units.gu(2)
 
-            Row {
-                spacing: units.gu(4)
-                anchors.horizontalCenter: parent.horizontalCenter
-                height: paintedHeight + units.gu(3)
-                Repeater {
-                    model: telepathyHelper.activeAccounts
-                    delegate: Label {
-                        text: modelData.displayName
-                        color: UbuntuColors.orange
-                        MouseArea {
-                            anchors.fill: parent
-                            onClicked: {
-                                PopupUtils.close(dialogue)
-                                telepathyHelper.setDefaultAccount(TelepathyHelper.Messaging, modelData)
-                            }
-                        }
-                    }
-                }
-            }
-
             Label {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 height: paintedHeight + units.gu(6)
                 verticalAlignment: Text.AlignVCenter
-                text: i18n.tr("Select a default SIM for all outgoing messages. You can always alter your choice in <a href=\"system_settings\">System Settings</a>.")
+                text: i18n.tr("If you wish to edit your SIM and other mobile preferences, please visit <a href=\"system_settings\">System Settings</a>.")
                 wrapMode: Text.WordWrap
                 onLinkActivated: {
                     PopupUtils.close(dialogue)
                     Qt.openUrlExternally("settings:///system/cellular")
                 }
             }
-            Row {
-                spacing: units.gu(4)
-                anchors.horizontalCenter: parent.horizontalCenter
-                Button {
-                    objectName: "noNoSimCardDefaultDialog"
-                    text: i18n.tr("No")
-                    color: UbuntuColors.orange
-                    onClicked: {
-                        settings.mainViewDontAskCount = 3
-                        PopupUtils.close(dialogue)
-                        Qt.inputMethod.hide()
-                    }
-                }
-                Button {
-                    objectName: "laterNoSimCardDefaultDialog"
-                    text: i18n.tr("Later")
-                    color: UbuntuColors.orange
-                    onClicked: {
-                        PopupUtils.close(dialogue)
-                        settings.mainViewDontAskCount++
-                        Qt.inputMethod.hide()
-                    }
+            Button {
+                objectName: "closeNoSimCardDefaultDialog"
+                text: i18n.tr("Close")
+                color: UbuntuColors.orange
+                onClicked: {
+                    settings.mainViewIgnoreFirstTimeDialog = true
+                    PopupUtils.close(dialogue)
+                    Qt.inputMethod.hide()
                 }
             }
         }

=== modified file 'src/qml/MMSDelegate.qml'
--- src/qml/MMSDelegate.qml	2015-11-19 16:17:37 +0000
+++ src/qml/MMSDelegate.qml	2015-11-19 16:17:37 +0000
@@ -64,8 +64,8 @@
             attachment.push(item.filePath)
             newAttachments.push(attachment)
         }
-        deleteMessage()
-        messages.sendMessage(textMessage, messages.participantIds, newAttachments)
+        messages.sendMessage(textMessage, messages.participantIds, newAttachments, {"x-canonical-tmp-files": true})
+        deleteMessage();
     }
 
     function copyMessage()

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2015-11-19 16:17:37 +0000
+++ src/qml/Messages.qml	2015-11-19 16:17:37 +0000
@@ -325,7 +325,11 @@
         multiRecipient.forceActiveFocus()
     }
 
-    function sendMessage(text, participantIds, attachments) {
+    function sendMessage(text, participantIds, attachments, properties) {
+        if (typeof(properties) === 'undefined') {
+            properties = {}
+        }
+
         // check if at least one account is selected
         if (!messages.account) {
             Qt.inputMethod.hide()
@@ -427,20 +431,19 @@
             }
             eventModel.writeEvents([event]);
         } else {
-            var isMMS = attachments.length > 0
-            var isMmsGroupChat = participantIds.length > 1 && telepathyHelper.mmsGroupChat
+            var isMmsGroupChat = participants.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 != ""
-            // FIXME: maybe move this to telepathy-ofono itself and treat as just sendMessage on the app?
-            if (isMMS || (isMmsGroupChat && isSelfContactKnown)) {
-                chatManager.sendMMS(participantIds, text, attachments, messages.account.accountId)
-            } else {
-                chatManager.sendMessage(participantIds, text, messages.account.accountId)
+            if (isMmsGroupChat && !isSelfContactKnown) {
+                // TODO: inform the user to enter the phone number of the selected sim card manually
+                // and use it in the telepathy-ofono account as selfContactId. 
+                return
             }
+            chatManager.sendMessage(messages.account.accountId, participantIds, text, attachments, properties)
         }
 
         // FIXME: soon it won't be just about SIM cards, so the dialogs need updating
-        if (multiplePhoneAccounts && !telepathyHelper.defaultMessagingAccount && !settings.messagesDontAsk) {
+        if (multiplePhoneAccounts && !telepathyHelper.defaultMessagingAccount && !settings.messagesDontAsk && account.type == AccountEntry.PhoneAccount) {
             Qt.inputMethod.hide()
             PopupUtils.open(Qt.createComponent("Dialogs/SetDefaultSIMCardDialog.qml").createObject(messages))
         } else {
@@ -854,6 +857,7 @@
             name: "groupChat"
             head: messages.head
             when: groupChat
+            contents: header
             backAction: backButton
 
             actions: [

=== modified file 'src/qml/messaging-app.qml'
--- src/qml/messaging-app.qml	2015-11-19 16:17:37 +0000
+++ src/qml/messaging-app.qml	2015-11-19 16:17:37 +0000
@@ -27,7 +27,6 @@
 MainView {
     id: mainView
 
-    property string newPhoneNumber
     property bool multiplePhoneAccounts: {
         var numAccounts = 0
         for (var i in telepathyHelper.activeAccounts) {
@@ -45,7 +44,7 @@
     function defaultPhoneAccount() {
         // we only use the default account property if we have more
         // than one account, otherwise we use always the first one
-        if (multiplePhoneAccounts) {
+        if (multiplePhoneAccounts && telepathyHelper.defaultMessagingAccount) {
             return telepathyHelper.defaultMessagingAccount
         } else {
             for (var i in telepathyHelper.activeAccounts) {
@@ -133,7 +132,6 @@
         onDefaultMessagingAccountChanged: account = Qt.binding(defaultPhoneAccount)
     }
 
-
     automaticOrientation: true
     width: units.gu(40)
     height: units.gu(71)
@@ -148,8 +146,7 @@
         target: telepathyHelper
         onSetupReady: {
             if (multiplePhoneAccounts && !telepathyHelper.defaultMessagingAccount &&
-                settings.mainViewDontAskCount < 3 && mainStack.depth === 1) {
-                // FIXME: soon it will be more than just SIM cards, update the dialog accordingly
+                !settings.mainViewIgnoreFirstTimeDialog && mainStack.depth === 1) {
                 PopupUtils.open(Qt.createComponent("Dialogs/NoDefaultSIMCardDialog.qml").createObject(mainView))
             }
         }
@@ -171,7 +168,7 @@
         id: settings
         category: "DualSim"
         property bool messagesDontAsk: false
-        property int mainViewDontAskCount: 0
+        property bool mainViewIgnoreFirstTimeDialog: false
     }
 
     Connections {
@@ -227,9 +224,13 @@
                                                            participantIds,
                                                            mainView.account.type == AccountEntry.PhoneAccount ? HistoryThreadModel.MatchPhoneNumber
                                                                                                               : HistoryThreadModel.MatchCaseSensitive,
-                                                           true)
-            properties["participants"] = thread.participants
-        } else {
+                                                           false)
+            if (thread.hasOwnProperty("participants")) {
+                properties["participants"] = thread.participants
+            }
+        }
+
+        if (!properties.hasOwnProperty("participants")) {
             var participants = []
             for (var i in participantIds) {
                 var participant = {}