Skip to content

Commit

Permalink
Merge branch 'subparts' into 'master'
Browse files Browse the repository at this point in the history
Some (rare) mails are not properly showing their attachments (not
Apple kind ones), as explained in MER#1574.

This is due to the fact that the routine that looks for attachments
works on one level only of mail subpart. The proposed MR adds a
recursive call to look for an attachment on any possible sub-level.

An example of non-working email is attached to the MER bug. This MR
corrects the behaviour for this mail.

See merge request !3
  • Loading branch information
Slava Monich committed May 2, 2016
2 parents a7050dd + 7134c6b commit f500605
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions qmf/src/libraries/qmfclient/qmailmessage.cpp
Expand Up @@ -1159,6 +1159,9 @@ namespace findAttachments
if (container.multipartType() == QMailMessagePart::MultipartMixed) {
inMultipartMixed(container, found, hasAttachments);
}
if (container.multipartType() == QMailMessagePart::MultipartAlternative) {
inMultipartMixed(container, found, hasAttachments);
}
if (container.multipartType() == QMailMessagePart::MultipartSigned) {
inMultipartSigned(container, found, hasAttachments);
}
Expand Down Expand Up @@ -1206,6 +1209,10 @@ namespace findAttachments
case QMailMessagePart::MultipartNone:
inMultipartNone(part, found, hasAttachments);
break;
case QMailMessagePart::MultipartMixed:
case QMailMessagePart::MultipartAlternative:
inMultipartMixed(part, found, hasAttachments);
break;
default:
break;
}
Expand Down

0 comments on commit f500605

Please sign in to comment.