[qmf] Don't enqueue the preferred body for fetching twice

For mutipart/alternative mails the code introduced by commit:
a7096490c094608239918ebbdbcca8003e81a8de, enqueues the preferred body part
twice when the content size is bigger that maxMailSize, causing the
part to be written twice.

qmf/src/plugins/messageservices/imap/imapstrategy.cpp

@@ -1369,8 +1369,8 @@ void ImapFetchSelectedMessagesStrategy::metaDataAnalysis(ImapStrategyContextBase
                                                    const QList<QMailMessagePartContainer::Location> &attachmentLocations,
                                                    QList<QPair<QMailMessagePart::Location, uint> > &sectionList,
                                                    QList<QPair<QMailMessagePart::Location, uint> > &completionSectionList,
-                                                   uint &bytesLeft,
-                                                   bool &foundBody)
+                                                   QMailMessagePartContainer::Location &preferredBody,
+                                                   uint &bytesLeft)
 {
     // Download limit has been exhausted for this message
     if (bytesLeft == 0) {
@@ -1382,7 +1382,7 @@ void ImapFetchSelectedMessagesStrategy::metaDataAnalysis(ImapStrategyContextBase
 
     // Iterate over all parts, looking for the preferred body,
     // download that first giving preference over all other parts
-    if (!preferred.isEmpty() && !foundBody) {
+    if (!preferred.isEmpty() && !preferredBody.isValid()) {
         for (uint i = 0; i < partContainer.partCount(); ++i) {
             const QMailMessagePart part(partContainer.partAt(i));
             const QMailMessageContentDisposition disposition(part.contentDisposition());
@@ -1404,7 +1404,7 @@ void ImapFetchSelectedMessagesStrategy::metaDataAnalysis(ImapStrategyContextBase
                     completionSectionList.append(qMakePair(part.location(), static_cast<unsigned>(bytesLeft)));
                     bytesLeft = 0;
                 }
-                foundBody = true;
+                preferredBody = part.location();
                 break;
             }
         }
@@ -1414,12 +1414,11 @@ void ImapFetchSelectedMessagesStrategy::metaDataAnalysis(ImapStrategyContextBase
     for (uint i = 0; i < partContainer.partCount(); ++i) {
         const QMailMessagePart part(partContainer.partAt(i));
         const QMailMessageContentDisposition disposition(part.contentDisposition());
-        const QMailMessageContentType contentType(part.contentType());
 
         if (part.partCount() > 0) {
             metaDataAnalysis(context, part, attachmentLocations,
                              sectionList, completionSectionList,
-                             bytesLeft, foundBody);
+                             preferredBody, bytesLeft);
         } else if (part.partialContentAvailable()) {
             continue;
         } else if (disposition.size() <= 0) {
@@ -1429,8 +1428,11 @@ void ImapFetchSelectedMessagesStrategy::metaDataAnalysis(ImapStrategyContextBase
                    && attachmentLocations.contains(part.location())) {
             continue;
         } else {
-            // This is a regular part. Try to download it completely.
-            sectionList.append(qMakePair(part.location(), (uint)disposition.size()));
+            // This is a regular part. Try to download it completely, if it is not the preferred Body
+            // that is already added to the list.
+            if (!(part.location() == preferredBody)) {
+                sectionList.append(qMakePair(part.location(), (uint)disposition.size()));
+            }
         }
     }
 }
@@ -1468,11 +1470,11 @@ void ImapFetchSelectedMessagesStrategy::prepareCompletionList(
             uint bytesLeft = _headerLimit;
             int partsToRetrieve = 0;
             const int maxParts = 100;
-            bool foundBody = false;
             QList<QPair<QMailMessagePart::Location, uint> > sectionList;
+            QMailMessagePart::Location preferredBody;
             metaDataAnalysis(context, message, attachmentLocations,
                              sectionList, completionSectionList,
-                             bytesLeft, foundBody);
+                             preferredBody, bytesLeft);
 
             qSort(sectionList.begin(), sectionList.end(), qMailMessageImapStrategyLessThan);
             QList<QPair<QMailMessagePart::Location, uint> >::iterator it = sectionList.begin();

qmf/src/plugins/messageservices/imap/imapstrategy.h

@@ -338,8 +338,8 @@ class ImapFetchSelectedMessagesStrategy : public ImapMessageListStrategy
                                   const QList<QMailMessagePartContainer::Location> &attachmentLocations,
                                   QList<QPair<QMailMessagePart::Location, uint> > &sectionList,
                                   QList<QPair<QMailMessagePart::Location, uint> > &completionSectionList,
-                                  uint &bytesLeft,
-                                  bool &foundBody);
+                                  QMailMessagePart::Location &preferredBody,
+                                  uint &bytesLeft);
 
     QMailRetrievalAction::RetrievalSpecification _retrievalSpec;
 

rpm/qmf-qt5.spec

@@ -1,6 +1,6 @@
 Name: qmf-qt5
 Summary:    Qt Messaging Framework (QMF) Qt5
-Version:    4.0.4+git11
+Version:    4.0.4+git12
 Release:    1
 Group:      System/Libraries
 License:    LGPLv2.1 with exception or GPLv3