Merge lp:~tiagosh/telephony-service/fix-1517654 into lp:telephony-service

[Tiago Salem Herrmann]

Fill notifications with attachments info when no text is received.

Fill notifications with attachments info when no text is received.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1149
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/633/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/301
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/301/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/301

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/633/rebuild

review: Approve (continuous-integration)

=== modified file 'indicator/textchannelobserver.cpp'
--- indicator/textchannelobserver.cpp	2015-11-19 12:59:24 +0000
+++ indicator/textchannelobserver.cpp	2015-12-02 18:32:21 +0000
@@ -404,6 +404,41 @@
         }
     }
 
+    // if messageText is empty, search for attachments
+    if (messageText.isEmpty()) {
+        int imageCount = 0;
+        int videoCount = 0;
+        int contactCount = 0;
+        int audioCount = 0;
+        int attachmentCount = 0;
+        Q_FOREACH(const Tp::MessagePart &part, messageParts) {
+            QString contentType = part["content-type"].variant().toString();
+            if (contentType.startsWith("image/")) {
+                imageCount++;
+            } else if (contentType.startsWith("video/")) {
+                videoCount++;
+            } else if (contentType.startsWith("audio/")) {
+                audioCount++;
+            } else if (contentType.startsWith("text/vcard") ||
+                      contentType.startsWith("text/x-vcard")) {
+                contactCount++;
+            }
+        }
+        attachmentCount = imageCount + videoCount + contactCount;
+
+        if (imageCount > 0 && attachmentCount == imageCount) {
+            messageText = QString::fromUtf8(C::ngettext("Attachment: %1 image", "Attachments: %1 images", imageCount)).arg(imageCount);
+        } else if (videoCount > 0 && attachmentCount == videoCount) {
+            messageText = QString::fromUtf8(C::ngettext("Attachment: %1 video", "Attachments: %1 videos", videoCount)).arg(videoCount);
+        } else if (contactCount > 0 && attachmentCount == contactCount) {
+            messageText = QString::fromUtf8(C::ngettext("Attachment: %1 contact", "Attachments: %1 contacts", contactCount)).arg(contactCount);
+        } else if (audioCount > 0 && attachmentCount == audioCount) {
+            messageText = QString::fromUtf8(C::ngettext("Attachment: %1 audio clip", "Attachments: %1 audio clips", audioCount)).arg(audioCount);
+        } else if (attachmentCount > 0) {
+            messageText = QString::fromUtf8(C::ngettext("Attachment: %1 file", "Attachments: %1 files", attachmentCount)).arg(attachmentCount);
+        }
+    }
+
     // WORKAROUND: powerd can't decide when to wake up the screen on incoming mms's
     // (or other telepathy accounts) as the download of the attachments is made by 
     // another daemon, so we wake up the screen here.