Merge lp:~tiagosh/messaging-app/mms-group-chat into lp:messaging-app

[Tiago Salem Herrmann]

Add initial MMS group chat support.

Add initial MMS group chat support.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~tiagosh/telepathy-ofono/mms-group-chat/+merge/243431
https://code.launchpad.net/~tiagosh/telephony-service/flag-mms/+merge/243433

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/<package-name>) 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:277
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/495/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/464
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/8
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/410
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/464
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/464/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16421
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/276
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/276/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/mms-group-chat]

278. By Tiago Salem Herrmann on 2015-01-15

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:278
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/504/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/824
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/401
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/17
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/719
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/822
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/822/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17125
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/419
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/419/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/mms-group-chat]

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

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:279
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/512/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1032/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/479
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/25
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/913/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1030
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1030/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17526
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/585
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/585/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/mms-group-chat]

280. By Tiago Salem Herrmann on 2015-02-04

fix variable name

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:280
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/515/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1177
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/545
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/28
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1037
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1175
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1175/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17778
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/654
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/654/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/515/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

=== modified file 'src/qml/MMSDelegate.qml'
--- src/qml/MMSDelegate.qml	2015-01-05 20:35:11 +0000
+++ src/qml/MMSDelegate.qml	2015-02-04 21:00:55 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 2.2
 import Ubuntu.Components 1.1
+import Ubuntu.Telephony 0.1
 
 MessageDelegate {
     id: root
@@ -215,6 +216,18 @@
                 value: root.messageText.length > 0 ? root.messageText : i18n.tr("Missing message data")
                 when: bubbleLoader.status === Loader.Ready
             }
+            Binding {
+                target: bubbleLoader.item
+                property: "sender"
+                value: contactWatcher.isUnknown ? contactWatcher.phoneNumber : contactWatcher.alias
+                when: bubbleLoader.status === Loader.Ready && messageData.senderId !== "self"
+            }
+ 
+            ContactWatcher {
+                id: contactWatcher
+                phoneNumber: participants.length > 1 && messageData.senderId !== "self" ? messageData.senderId : ""
+            }
+ 
         }
     }
 }

=== modified file 'src/qml/MessageBubble.qml'
--- src/qml/MessageBubble.qml	2014-11-21 13:55:07 +0000
+++ src/qml/MessageBubble.qml	2015-02-04 21:00:55 +0000
@@ -81,9 +81,9 @@
         }
     }
     radius: 9
-    height: senderName.height + textLabel.height + textTimestamp.height + units.gu(1)
+    height: senderName.height + senderName.anchors.topMargin + textLabel.height + textTimestamp.height + units.gu(1)
     width:  Math.min(units.gu(27),
-                     Math.max(textLabel.contentWidth, textTimestamp.contentWidth))
+                     Math.max(textLabel.contentWidth, textTimestamp.contentWidth, senderName.contentWidth))
             + units.gu(3)
     anchors{
         leftMargin:  units.gu(1)
@@ -95,12 +95,13 @@
 
         anchors {
             top: parent.top
-            topMargin: units.gu(0.5)
+            topMargin: height != 0 ? units.gu(0.5) : 0
             left: parent.left
-            leftMargin: root.messageIncoming ? units.gu(2) : units.gu(1)
+            leftMargin: units.gu(1)
         }
         height: text === "" ? 0 : paintedHeight
-        fontSize: "large"
+        width: paintedWidth > maxDelegateWidth ? maxDelegateWidth : undefined
+        fontSize: "small"
     }
 
     Label {

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2015-01-21 16:58:14 +0000
+++ src/qml/Messages.qml	2015-02-04 21:00:55 +0000
@@ -208,7 +208,7 @@
     }
 
     function markMessageAsRead(accountId, threadId, eventId, type) {
-        chatManager.acknowledgeMessage(participants[0], eventId, accountId)
+        chatManager.acknowledgeMessage(participants, eventId, accountId)
         return eventModel.markEventAsRead(accountId, threadId, eventId, type);
     }
 
@@ -947,7 +947,11 @@
                     }
                 }
                 updateFilters()
-                if (attachments.count > 0) {
+                var isMMS = attachments.count > 0
+                var isMmsGroupChat = participants.length > 1 && telepathyHelper.mmsGroupChat
+                // mms group chat only works if we known our own phone number
+                var isSelfContactKnown = account.selfContactId != ""
+                if (isMMS || (isMmsGroupChat && isSelfContactKnown)) {
                     var newAttachments = []
                     for (var i = 0; i < attachments.count; i++) {
                         var attachment = []

=== modified file 'src/qml/messaging-app.qml'
--- src/qml/messaging-app.qml	2014-10-17 18:15:29 +0000
+++ src/qml/messaging-app.qml	2015-02-04 21:00:55 +0000
@@ -136,13 +136,13 @@
         mainStack.currentPage.showBottomEdgePage(Qt.resolvedUrl("Messages.qml"))
     }
 
-    function startChat(phoneNumber, text) {
+    function startChat(phoneNumbers, text) {
         var properties = {}
-        var participants = [phoneNumber]
+        var participants = phoneNumbers.split(";")
         properties["participants"] = participants
         properties["text"] = text
         emptyStack()
-        if (phoneNumber === "") {
+        if (participants.length === 0) {
             return;
         }
         mainStack.push(Qt.resolvedUrl("Messages.qml"), properties)