Merge lp:~tiagosh/messaging-app/mms-send-fixes into lp:messaging-app

[Tiago Salem Herrmann]

- Ignore x-smil content-type
- Enable spinner for mms

- Ignore x-smil content-type
- Enable spinner for mms

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~tiagosh/history-service/mms-send-fixes/+merge/228341

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/messaging-app) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
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:131
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/301/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2391
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1952
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/95
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/95/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/95
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2560
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3614
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3614/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10295
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1634
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2197
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2197/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/mms-send-fixes]

132. By Tiago Salem Herrmann on 2014-07-25

improve performance
set thread labels correctly for mms

133. By Tiago Salem Herrmann on 2014-07-25

remove debug

134. By Tiago Salem Herrmann on 2014-07-25

remove commented code

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/311/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2522
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2030
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2667
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3765
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3765/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1698
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2283
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2283/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2014-07-15 15:23:21 +0000
+++ src/qml/MainPage.qml	2014-07-25 16:28:41 +0000
@@ -146,6 +146,8 @@
             sortField: "lastEventTimestamp"
             sortOrder: HistorySort.DescendingOrder
         }
+        filter: HistoryFilter {
+        }
     }
 
     Component {

=== modified file 'src/qml/MessageDelegate.qml'
--- src/qml/MessageDelegate.qml	2014-07-14 15:47:34 +0000
+++ src/qml/MessageDelegate.qml	2014-07-25 16:28:41 +0000
@@ -103,7 +103,8 @@
                         return "MMS/MMSImage.qml"
                     } else if (startsWith(modelData.contentType, "video/")) {
                         return "MMS/MMSVideo.qml"
-                    } else if (modelData.contentType === "application/smil" ) {
+                    } else if (startsWith(modelData.contentType, "application/smil") ||
+                              startsWith(modelData.contentType, "application/x-smil")) {
                         console.log("Ignoring SMIL file")
                         return ""
                     } else if (startsWith(modelData.contentType, "text/plain") ) {
@@ -260,7 +261,7 @@
             visible: running && !selectionMode
             // if temporarily failed or unknown status, then show the spinner
             running: (textMessageStatus == HistoryThreadModel.MessageStatusUnknown ||
-                      textMessageStatus == HistoryThreadModel.MessageStatusTemporarilyFailed) && !incoming && mmsText === ""
+                      textMessageStatus == HistoryThreadModel.MessageStatusTemporarilyFailed) && !incoming
         }
 
         Label {

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2014-07-23 16:40:57 +0000
+++ src/qml/Messages.qml	2014-07-25 16:28:41 +0000
@@ -58,8 +58,13 @@
             }
             var filePath = String(transfer.items[i].url).replace('file://', '')
             // get only the basename
-            attachment["name"] = filePath.split('/').reverse()[0]
             attachment["contentType"] = application.fileMimeType(filePath)
+            if (startsWith(attachment["contentType"], "text/vcard") ||
+                startsWith(attachment["contentType"], "text/x-vcard")) {
+                attachment["name"] = "contact.vcf"
+            } else {
+                attachment["name"] = filePath.split('/').reverse()[0]
+            }
             attachment["filePath"] = filePath
             attachments.append(attachment)
         }
@@ -345,30 +350,147 @@
         }
     }
 
-    ContactListView {
-        id: contactSearch
-
-        property bool searchEnabled: multiRecipient.searchString !== "" && multiRecipient.focus
-
-        visible: searchEnabled
-        detailToPick: ContactDetail.PhoneNumber
-        clip: true
-        z: 1
-        autoUpdate: false
-        filterTerm: multiRecipient.searchString
-        showSections: false
-
-        states: [
-            State {
-                name: "empty"
-                when: contactSearch.count === 0
-                PropertyChanges {
-                    target: contactSearch
-                    height: 0
-                }
-            }
-        ]
-
+    Component {
+        id: contactSearchComponent
+
+        ContactListView {
+            id: contactSearch
+
+            detailToPick: ContactDetail.PhoneNumber
+            clip: true
+            z: 1
+            autoUpdate: false
+            filterTerm: multiRecipient.searchString
+            showSections: false
+
+            states: [
+                State {
+                    name: "empty"
+                    when: contactSearch.count === 0
+                    PropertyChanges {
+                        target: contactSearch
+                        height: 0
+                    }
+                }
+            ]
+
+            anchors {
+                top: accountList.bottom
+                topMargin: units.gu(1)
+                left: parent.left
+                right: parent.right
+                bottom: bottomPanel.top
+            }
+
+            Behavior on height {
+                UbuntuNumberAnimation { }
+            }
+
+            InvalidFilter {
+                id: invalidFilter
+            }
+
+            // clear list if it is invisible to save some memory
+            onVisibleChanged: {
+                if (visible && (filter != null)) {
+                    changeFilter(null)
+                    update()
+                } else if (!visible && filter != invalidFilter) {
+                    changeFilter(invalidFilter)
+                    update()
+                }
+            }
+
+            ContactDetailPhoneNumberTypeModel {
+                id: phoneTypeModel
+            }
+
+            listDelegate: Item {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(2)
+                }
+                height: phoneRepeater.count * units.gu(6)
+                Column {
+                    anchors.fill: parent
+                    spacing: units.gu(1)
+
+                    Repeater {
+                        id: phoneRepeater
+
+                        model: contact.phoneNumbers.length
+
+                        delegate: MouseArea {
+                            anchors {
+                                left: parent.left
+                                right: parent.right
+                            }
+                            height: units.gu(5)
+
+                            onClicked: {
+                                multiRecipient.addRecipient(contact.phoneNumbers[index].number)
+                                multiRecipient.clearSearch()
+                                multiRecipient.forceActiveFocus()
+                            }
+
+                            Column {
+                                anchors.fill: parent
+
+                                Label {
+                                    anchors {
+                                        left: parent.left
+                                        right: parent.right
+                                    }
+                                    height: units.gu(2)
+                                    text: {
+                                        // this is necessary to keep the string in the original format
+                                        var originalText = contact.displayLabel.label
+                                        var lowerSearchText =  multiRecipient.searchString.toLowerCase()
+                                        var lowerText = originalText.toLowerCase()
+                                        var searchIndex = lowerText.indexOf(lowerSearchText)
+                                        if (searchIndex !== -1) {
+                                            var piece = originalText.substr(searchIndex, lowerSearchText.length)
+                                            return originalText.replace(piece, "<b>" + piece + "</b>")
+                                        } else {
+                                            return originalText
+                                        }
+                                    }
+                                    fontSize: "medium"
+                                    color: UbuntuColors.lightAubergine
+                                }
+                                Label {
+                                    anchors {
+                                        left: parent.left
+                                        right: parent.right
+                                    }
+                                    height: units.gu(2)
+                                    text: {
+                                        var phoneDetail = contact.phoneNumbers[index]
+                                        return ("%1 %2").arg(phoneTypeModel.get(phoneTypeModel.getTypeIndex(phoneDetail)).label)
+                                                        .arg(phoneDetail.number)
+                                    }
+                                }
+                                Item {
+                                    anchors {
+                                        left: parent.left
+                                        right: parent.right
+                                    }
+                                    height: units.gu(1)
+                                }
+
+                                ListItem.ThinDivider {}
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Loader {
+        active: multiRecipient.searchString !== "" && multiRecipient.focus
+        sourceComponent: contactSearchComponent
         anchors {
             top: accountList.bottom
             topMargin: units.gu(1)
@@ -376,110 +498,7 @@
             right: parent.right
             bottom: bottomPanel.top
         }
-
-        Behavior on height {
-            UbuntuNumberAnimation { }
-        }
-
-        InvalidFilter {
-            id: invalidFilter
-        }
-
-        // clear list if it is invisible to save some memory
-        onVisibleChanged: {
-            if (visible && (filter != null)) {
-                changeFilter(null)
-                update()
-            } else if (!visible && filter != invalidFilter) {
-                changeFilter(invalidFilter)
-                update()
-            }
-        }
-
-        ContactDetailPhoneNumberTypeModel {
-            id: phoneTypeModel
-        }
-
-        listDelegate: Item {
-            anchors {
-                left: parent.left
-                right: parent.right
-                margins: units.gu(2)
-            }
-            height: phoneRepeater.count * units.gu(6)
-            Column {
-                anchors.fill: parent
-                spacing: units.gu(1)
-
-                Repeater {
-                    id: phoneRepeater
-
-                    model: contact.phoneNumbers.length
-
-                    delegate: MouseArea {
-                        anchors {
-                            left: parent.left
-                            right: parent.right
-                        }
-                        height: units.gu(5)
-
-                        onClicked: {
-                            multiRecipient.addRecipient(contact.phoneNumbers[index].number)
-                            multiRecipient.clearSearch()
-                            multiRecipient.forceActiveFocus()
-                        }
-
-                        Column {
-                            anchors.fill: parent
-
-                            Label {
-                                anchors {
-                                    left: parent.left
-                                    right: parent.right
-                                }
-                                height: units.gu(2)
-                                text: {
-                                    // this is necessary to keep the string in the original format
-                                    var originalText = contact.displayLabel.label
-                                    var lowerSearchText =  multiRecipient.searchString.toLowerCase()
-                                    var lowerText = originalText.toLowerCase()
-                                    var searchIndex = lowerText.indexOf(lowerSearchText)
-                                    if (searchIndex !== -1) {
-                                        var piece = originalText.substr(searchIndex, lowerSearchText.length)
-                                        return originalText.replace(piece, "<b>" + piece + "</b>")
-                                    } else {
-                                        return originalText
-                                    }
-                                }
-                                fontSize: "medium"
-                                color: UbuntuColors.lightAubergine
-                            }
-                            Label {
-                                anchors {
-                                    left: parent.left
-                                    right: parent.right
-                                }
-                                height: units.gu(2)
-                                text: {
-                                    var phoneDetail = contact.phoneNumbers[index]
-                                    return ("%1 %2").arg(phoneTypeModel.get(phoneTypeModel.getTypeIndex(phoneDetail)).label)
-                                                    .arg(phoneDetail.number)
-                                }
-                            }
-                            Item {
-                                anchors {
-                                    left: parent.left
-                                    right: parent.right
-                                }
-                                height: units.gu(1)
-                            }
-
-                            ListItem.ThinDivider {}
-                        }
-                    }
-                }
-            }
-        }
+        z: 1
     }
 
     ContactWatcher {

=== modified file 'src/qml/ThreadDelegate.qml'
--- src/qml/ThreadDelegate.qml	2014-07-15 15:23:21 +0000
+++ src/qml/ThreadDelegate.qml	2014-07-25 16:28:41 +0000
@@ -44,6 +44,40 @@
     property bool unknownContact: delegateHelper.isUnknown
     property bool selectionMode: false
     property string threadId: model.threadId
+    property string textMessage: {
+        // check if this is an mms, if so, search for the actual text
+        var imageCount = 0
+        var videoCount = 0
+        var contactCount = 0
+        var attachmentCount = 0
+        for (var i = 0; i < eventTextAttachments.length; i++) {
+            if (startsWith(eventTextAttachments[i].contentType, "text/plain")) {
+                return application.readTextFile(eventTextAttachments[i].filePath)
+            } else if (startsWith(eventTextAttachments[i].contentType, "image/")) {
+                imageCount++
+            } else if (startsWith(eventTextAttachments[i].contentType, "video/")) {
+                videoCount++
+            } else if (startsWith(eventTextAttachments[i].contentType, "text/vcard") ||
+                      startsWith(eventTextAttachments[i].contentType, "text/x-vcard")) {
+                contactCount++
+            }
+        }
+        attachmentCount = imageCount + videoCount + contactCount
+
+        if (imageCount > 0 && attachmentCount == imageCount) {
+            return i18n.tr("Attachment: %1 image", "Attachments: %s images").arg(imageCount)
+        }
+        if (videoCount > 0 && attachmentCount == videoCount) {
+            return i18n.tr("Attachment: %1 video", "Attachments: %s videos").arg(videoCount)
+        }
+        if (contactCount > 0 && attachmentCount == contactCount) {
+            return i18n.tr("Attachment: %1 contact", "Attachments: %s contacts").arg(contactCount)
+        }
+        if (attachmentCount > 0) {
+            return i18n.tr("Attachment: %1 file", "Attachments: %s files").arg(attachmentCount)
+        }
+        return eventTextMessage
+    }
     anchors.left: parent.left
     anchors.right: parent.right
     height: units.gu(10)
@@ -176,7 +210,7 @@
         maximumLineCount: 2
         fontSize: "x-small"
         wrapMode: Text.WordWrap
-        text: eventTextMessage == undefined ? "" : eventTextMessage
+        text: textMessage
         font.weight: Font.Light
     }
     onItemRemoved: {