Merge branch 'calendar' into 'master'

[qmfclient] don't return calendar invitation as attachment MER#1587. See merge request !5
sailfishos · Jul 3, 2017 · 8680704 · 8680704
2 parents d71ea8a + 81300c6
commit 8680704
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/qmf/src/libraries/qmfclient/qmailmessage.cpp b/qmf/src/libraries/qmfclient/qmailmessage.cpp
@@ -1169,6 +1169,9 @@ namespace findAttachments
             bool isText = (contentType.matches("text", "plain")
                            || contentType.matches("text", "html"));
 
+            bool isCalendar = (contentType.type().toLower() == "text") &&
+                (contentType.subType().toLower() == "calendar");
+
             bool isInLine = (!part.contentDisposition().isNull()) &&
                 (part.contentDisposition().type() == QMailMessageContentDisposition::Inline);
 
@@ -1179,7 +1182,7 @@ namespace findAttachments
 
             // Attached messages are considered as attachments even if content disposition
             // is inline instead of attachment, but only if they aren't text/plain nor text/html
-            if (isRFC822 || isAttachment || (isInLine && !isText)) {
+            if (isRFC822 || isAttachment || (isInLine && !isText && !isCalendar)) {
                 if (found) {
                     *found << part.location();
                 }