Also generate boundaries when serializing QMailMessagePart

In a multipart messages, boundaries are generated when calling
QMailMessage::toRfc2822(). For signature purposes, there is a
need to generate RFC2822 compliant output for QMailMessagePart
only. Previous implementation of QMailMessagePart::toRfc2822()
introduced for signature purposes was lacking boundary
generation.

Change-Id: I7381cf2cb3a8bf83267f36e2f3f7369e8b040cef
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>

1 files changed, 18 insertions, 8 deletions

diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp
index cd8ca4b1..48b8b026 100644
--- a/src/libraries/qmfclient/qmailmessage.cpp
+++ b/src/libraries/qmfclient/qmailmessage.cpp
@@ -4223,6 +4223,20 @@ void QMailMessagePartContainerPrivate::setBoundary(const QByteArray& text)
     }
 }
 
+static QByteArray boundaryString(const QByteArray &hash);
+void QMailMessagePartContainerPrivate::generateBoundary()
+{
+    if (_multipartType != QMailMessagePartContainer::MultipartNone
+        && _boundary.isEmpty()) {
+        // Include a hash of the header data in the boundary
+        QCryptographicHash hash(QCryptographicHash::Md5);
+        foreach (const QByteArray *field, _header.fieldList())
+            hash.addData(*field);
+
+        setBoundary(boundaryString(hash.result()));
+    }
+}
+
 QMailMessageBody& QMailMessagePartContainerPrivate::body()
 {
     return _body;
@@ -6413,6 +6427,9 @@ void QMailMessagePart::output(QDataStream& out, bool includeAttachments, bool ex
 
 QByteArray QMailMessagePart::toRfc2822() const
 {
+    // Generate boundaries for this part, as in QMailMessage::toRfc2822().
+    const_cast<QMailMessagePartPrivate*>(impl(this))->generateBoundary();
+
     QByteArray result;
     QDataStream out(&result, QIODevice::WriteOnly);
     output(out, true, true);
@@ -7967,14 +7984,7 @@ void QMailMessagePrivate::toRfc2822(QDataStream **out, QMailMessage::EncodingFor
     bool includeBcc = (format != QMailMessage::TransmissionFormat);
     bool excludeInternalFields = (format == QMailMessage::TransmissionFormat);
 
-    if (_messageParts.count() && boundary().isEmpty()) {
-        // Include a hash of the header data in the boundary
-        QCryptographicHash hash(QCryptographicHash::Md5);
-        foreach (const QByteArray* field, _header.fieldList())
-            hash.addData(*field);
-
-        const_cast<QMailMessagePrivate*>(this)->setBoundary(boundaryString(hash.result()));
-    }
+    const_cast<QMailMessagePrivate*>(this)->generateBoundary();
 
     outputHeaders(**out, addTimeStamp, addContentHeaders, includeBcc, excludeInternalFields);
     **out << DataString('\n');