Merge lp:~tiagosh/messaging-app/unknown-attachments-delegate into lp:messaging-app

[Tiago Salem Herrmann]

Enable MMSDefault for unknown attachment types

Enable MMSDefault for unknown attachment types

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:325
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/531/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1541
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/654
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/44
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1539
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1539/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18359
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/521
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/768
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/768/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/unknown-attachments-delegate]

326. By Tiago Salem Herrmann on 2015-02-27

Change label according to the mime type.
update pot file

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/535/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1586
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/665
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/48
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1407
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1584
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1584/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18440
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/530
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/782
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/782/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'po/messaging-app.pot'
--- po/messaging-app.pot	2015-01-27 19:03:46 +0000
+++ po/messaging-app.pot	2015-02-27 21:42:15 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-16 15:26-0200\n"
+"POT-Creation-Date: 2015-02-27 18:40-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -19,7 +19,7 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. TRANSLATORS: %1 is the first recipient the message is sent to, %2 is the count of remaining recipients
-#: ../src/qml/ThreadDelegate.qml:45
+#: ../src/qml/ThreadDelegate.qml:51
 #, qt-format
 msgid "%1 + %2"
 msgstr ""
@@ -49,16 +49,11 @@
 msgid "+"
 msgstr ""
 
-#. TRANSLATORS: this refers to creating a new contact
-#: ../src/qml/NewRecipientPage.qml:179
-msgid "+ Create New"
-msgstr ""
-
 #: ../src/qml/MessageInfoDialog.qml:60
 msgid "Accepted"
 msgstr ""
 
-#: ../src/qml/Messages.qml:470
+#: ../src/qml/Messages.qml:563
 msgid "Add"
 msgstr ""
 
@@ -70,39 +65,43 @@
 msgid "All"
 msgstr ""
 
-#: ../src/qml/ThreadDelegate.qml:77
+#: ../src/qml/ThreadDelegate.qml:83
 #, qt-format
 msgid "Attachment: %1 contact"
 msgid_plural "Attachments: %1 contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/qml/ThreadDelegate.qml:80
+#: ../src/qml/ThreadDelegate.qml:86
 #, qt-format
 msgid "Attachment: %1 file"
 msgid_plural "Attachments: %1 files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/qml/ThreadDelegate.qml:71
+#: ../src/qml/ThreadDelegate.qml:77
 #, qt-format
 msgid "Attachment: %1 image"
 msgid_plural "Attachments: %1 images"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/qml/ThreadDelegate.qml:74
+#: ../src/qml/ThreadDelegate.qml:80
 #, qt-format
 msgid "Attachment: %1 video"
 msgid_plural "Attachments: %1 videos"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/qml/Messages.qml:460 ../src/qml/Messages.qml:514
+#: ../src/qml/MMS/MMSDefault.qml:28
+msgid "Audio attachment not supported"
+msgstr ""
+
+#: ../src/qml/Messages.qml:553 ../src/qml/Messages.qml:607
 msgid "Call"
 msgstr ""
 
-#: ../src/qml/MainPage.qml:84 ../src/qml/NewRecipientPage.qml:83
+#: ../src/qml/MainPage.qml:85 ../src/qml/NewRecipientPage.qml:83
 msgid "Cancel"
 msgstr ""
 
@@ -113,15 +112,15 @@
 msgstr ""
 
 #: ../src/qml/Dialogs/NoSIMCardSelectedDialog.qml:30
-#: ../src/qml/MessageInfoDialog.qml:137 ../src/qml/Messages.qml:266
+#: ../src/qml/MessageInfoDialog.qml:137 ../src/qml/Messages.qml:359
 msgid "Close"
 msgstr ""
 
-#: ../src/qml/MainPage.qml:140
+#: ../src/qml/MainPage.qml:141
 msgid "Compose a new message by swiping up from the bottom of the screen."
 msgstr ""
 
-#: ../src/qml/Messages.qml:524
+#: ../src/qml/Messages.qml:617
 msgid "Contact"
 msgstr ""
 
@@ -129,7 +128,7 @@
 msgid "Copy"
 msgstr ""
 
-#: ../src/qml/MessageDelegateFactory.qml:42 ../src/qml/ThreadDelegate.qml:105
+#: ../src/qml/MessageDelegateFactory.qml:42 ../src/qml/ThreadDelegate.qml:96
 msgid "Delete"
 msgstr ""
 
@@ -157,6 +156,10 @@
 msgid "Favorites"
 msgstr ""
 
+#: ../src/qml/MMS/MMSDefault.qml:33
+msgid "File type not supported"
+msgstr ""
+
 #: ../src/qml/MessageInfoDialog.qml:101
 msgid "From"
 msgstr ""
@@ -166,7 +169,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the number of participants in a group chat
-#: ../src/qml/Messages.qml:154
+#: ../src/qml/Messages.qml:247
 #, qt-format
 msgid "Group (%1)"
 msgstr ""
@@ -211,7 +214,7 @@
 msgid "Messaging application"
 msgstr ""
 
-#: ../src/qml/MMSDelegate.qml:215
+#: ../src/qml/MMSDelegate.qml:210
 msgid "Missing message data"
 msgstr ""
 
@@ -219,7 +222,7 @@
 msgid "Myself"
 msgstr ""
 
-#: ../src/qml/Messages.qml:157
+#: ../src/qml/Messages.qml:250
 msgid "New Message"
 msgstr ""
 
@@ -232,7 +235,7 @@
 msgid "No SIM card selected"
 msgstr ""
 
-#: ../src/qml/Messages.qml:262
+#: ../src/qml/Messages.qml:355
 msgid "No network"
 msgstr ""
 
@@ -259,7 +262,7 @@
 msgid "Received"
 msgstr ""
 
-#: ../src/qml/Messages.qml:216
+#: ../src/qml/Messages.qml:309
 msgid "Remove"
 msgstr ""
 
@@ -283,7 +286,7 @@
 msgid "Search"
 msgstr ""
 
-#: ../src/qml/MainPage.qml:53 ../src/qml/NewRecipientPage.qml:45
+#: ../src/qml/MainPage.qml:54 ../src/qml/NewRecipientPage.qml:45
 msgid "Search..."
 msgstr ""
 
@@ -293,7 +296,7 @@
 "choice in <a href=\"system_settings\">System Settings</a>."
 msgstr ""
 
-#: ../src/qml/Messages.qml:846
+#: ../src/qml/Messages.qml:974
 msgid "Send"
 msgstr ""
 
@@ -317,12 +320,12 @@
 msgid "Temporarily Failed"
 msgstr ""
 
-#: ../src/qml/Messages.qml:263
+#: ../src/qml/Messages.qml:356
 #, qt-format
 msgid "There is currently no network on %1"
 msgstr ""
 
-#: ../src/qml/Messages.qml:263
+#: ../src/qml/Messages.qml:356
 msgid "There is currently no network."
 msgstr ""
 
@@ -347,7 +350,7 @@
 msgstr ""
 
 #: ../src/qml/MMS/MMSContact.qml:83 ../src/qml/MMS/PreviewerContact.qml:27
-#: ../src/qml/Messages.qml:716
+#: ../src/qml/Messages.qml:844
 msgid "Unknown contact"
 msgstr ""
 
@@ -355,7 +358,11 @@
 msgid "Video Preview"
 msgstr ""
 
-#: ../src/qml/Messages.qml:816
+#: ../src/qml/MMS/MMSDefault.qml:31
+msgid "Video attachment not supported"
+msgstr ""
+
+#: ../src/qml/Messages.qml:944
 msgid "Write a message..."
 msgstr ""
 
 
=== modified file 'src/qml/MMS/MMSDefault.qml'
--- src/qml/MMS/MMSDefault.qml	2014-08-11 22:59:14 +0000
+++ src/qml/MMS/MMSDefault.qml	2015-02-27 21:42:15 +0000
@@ -23,24 +23,45 @@
 MMSBase {
     id: defaultDelegate
 
-    anchors.left: parent.left
-    anchors.right: parent.right
-    height: bubble.height + units.gu(1)
-    Item {
-        id: bubble
+    property string unknownLabel: {
+        if (startsWith(attachment.contentType, "audio/") ) {
+            return i18n.tr("Audio attachment not supported")
+            root.textAttachements.push(attachment)
+        } else if (startsWith(attachment.contentType, "video/")) {
+            return i18n.tr("Video attachment not supported")
+        }
+        return i18n.tr("File type not supported") 
+    }
+    height: units.gu(15)
+    width: Math.max(unknownAttachmentLabel.paintedWidth+units.gu(2), units.gu(27))
+
+    Image {
+        id: unknownAttachmentImage
+        fillMode: Image.PreserveAspectFit
+        anchors.centerIn: shape
+        anchors.verticalCenterOffset: -unknownAttachmentLabel.height/2
+        smooth: true
+        source: Qt.resolvedUrl("../assets/transfer-unsupported01.svg")
+        asynchronous: false
+        height: Math.min(implicitHeight, units.gu(8))
+        width: Math.min(implicitWidth, units.gu(27))
+        cache: false
+    }
+
+    Label {
+        id: unknownAttachmentLabel
+        color: "gray"
+        text: unknownLabel
+        anchors.horizontalCenter: unknownAttachmentImage.horizontalCenter
+        anchors.top: unknownAttachmentImage.bottom
+    }
+
+    UbuntuShape {
+        id: shape
         anchors.top: parent.top
-        width: label.width + units.gu(4)
-        height: label.height + units.gu(2)
-
-        Label {
-            id: label
-            text: attachment.attachmentId
-            anchors.centerIn: parent
-            anchors.horizontalCenterOffset: incoming ? units.gu(0.5) : -units.gu(0.5)
-            fontSize: "medium"
-            height: paintedHeight
-            color: textColor
-            opacity: incoming ? 1 : 0.9
-        }
+        width: parent.width
+        height: parent.height
+        color: "gray"
+        opacity: 0.2
     }
 }
 
=== modified file 'src/qml/MMSDelegate.qml'
--- src/qml/MMSDelegate.qml	2015-02-09 20:35:33 +0000
+++ src/qml/MMSDelegate.qml	2015-02-27 21:42:15 +0000
@@ -80,7 +80,7 @@
                                       "data": attachment,
                                       "delegateSource": "MMS/MMSImage.qml",
                                     })
-            } else if (startsWith(attachment.contentType, "video/")) {
+            //} else if (startsWith(attachment.contentType, "video/")) {
                         // TODO: implement proper video attachment support
                         //                dataAttachments.push({type: "video",
                         //                                  data: attachment,
@@ -88,11 +88,7 @@
                         //                                 })
             } else if (startsWith(attachment.contentType, "application/smil") ||
                        startsWith(attachment.contentType, "application/x-smil")) {
-                        // TODO: implement support for this kind of attachment
-                        //                dataAttachments.push({type: "application",
-                        //                                  data: attachment,
-                        //                                  delegateSource: "",
-                        //                                 })
+                // smil files will always be ignored here
             } else if (startsWith(attachment.contentType, "text/vcard") ||
                        startsWith(attachment.contentType, "text/x-vcard")) {
                 root.dataAttachments.push({"type": "vcard",
@@ -100,7 +96,10 @@
                                       "delegateSource": "MMS/MMSContact.qml"
                                     })
             } else {
-                console.log("No MMS render for " + attachment.contentType)
+                root.dataAttachments.push({"type": "default",
+                                      "data": attachment,
+                                      "delegateSource": "MMS/MMSDefault.qml"
+                                    })
             }
         }
         attachmentsRepeater.model = root.dataAttachments
 
=== added file 'src/qml/assets/transfer-unsupported01.svg'
--- src/qml/assets/transfer-unsupported01.svg	1970-01-01 00:00:00 +0000
+++ src/qml/assets/transfer-unsupported01.svg	2015-02-27 21:42:15 +0000
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.91+devel r"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="file-transfer-disabled.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.0745362"
+     inkscape:cx="23.683672"
+     inkscape:cy="38.262018"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4480"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         transform="matrix(0,-1,-1,0,-173.6378,899.36221)"
+         id="g4480">
+        <rect
+           style="fill:none;stroke:none"
+           id="rect4512"
+           width="90"
+           height="90"
+           x="458"
+           y="-605.63782" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4527"
+           d="m 512,-589.6378 c -4.41826,0 -7.99998,3.58171 -7.99998,8.00001 0,4.41826 3.58172,7.99999 7.99998,7.99999 4.41827,0 8,-3.58173 8,-7.99999 0,-4.4183 -3.58173,-8.00001 -8,-8.00001 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4518"
+           d="M 488.66666,-580.74888 474,-552.6378 l 13.76342,0 21.681,0 -10.84065,-20.77774 -3.05556,5.85657 -6.88155,-13.18991 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;enable-background:accumulate" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
+           d="M 6 6 L 6 72 L 45.480469 72 A 22.499983 22.499983 0 0 1 45 67.5 A 22.499983 22.499983 0 0 1 47.615234 57 L 12 57 L 12 12 L 66 12 L 66 45.052734 A 22.499983 22.499983 0 0 1 67.5 45 A 22.499983 22.499983 0 0 1 72 45.457031 L 72 6 L 6 6 z "
+           transform="translate(458,-605.6378)"
+           id="path4105" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#df382c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           d="M 67.5 51 A 16.499996 16.499996 0 0 0 51 67.5 A 16.499996 16.499996 0 0 0 67.5 84 A 16.499996 16.499996 0 0 0 84 67.5 A 16.499996 16.499996 0 0 0 67.5 51 z M 67.5 56 A 11.499993 11.499993 0 0 1 79 67.5 A 11.499993 11.499993 0 0 1 67.5 79 A 11.499993 11.499993 0 0 1 56 67.5 A 11.499993 11.499993 0 0 1 67.5 56 z "
+           transform="translate(458,-605.6378)"
+           id="path4200" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#df382c;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           d="m 515,-527.6378 21,-21"
+           id="path4192"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>