OmemoElement: Omit payload XML element if empty

2 files changed, 7 insertions, 2 deletions

diff --git a/src/base/QXmppOmemoData.cpp b/src/base/QXmppOmemoData.cpp
index 6ab0a8d3..c19f9b88 100644
--- a/src/base/QXmppOmemoData.cpp
+++ b/src/base/QXmppOmemoData.cpp
@@ -768,7 +768,11 @@ void QXmppOmemoElement::toXml(QXmlStreamWriter *writer) const
 
     writer->writeEndElement();  // header
 
-    helperToXmlAddTextElement(writer, QStringLiteral("payload"), d->payload.toBase64());
+    // The payload element is only included if there is a payload.
+    // An empty OMEMO message does not contain a payload.
+    if (!d->payload.isEmpty()) {
+        writer->writeTextElement(QStringLiteral("payload"), d->payload.toBase64());
+    }
 
     writer->writeEndElement();  // encrypted
 }
diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp
index 60a6562c..fab315ba 100644
--- a/tests/qxmppmessage/tst_qxmppmessage.cpp
+++ b/tests/qxmppmessage/tst_qxmppmessage.cpp
@@ -1181,11 +1181,12 @@ void tst_QXmppMessage::testOmemoElement()
         "<message type=\"chat\">"
         "<encrypted xmlns=\"urn:xmpp:omemo:2\">"
         "<header sid=\"0\"/>"
-        "<payload/>"
         "</encrypted>"
         "</message>"));
 
     QXmppMessage message1;
+    QVERIFY(!message1.omemoElement());
+
     parsePacket(message1, xmlIn);
     QVERIFY(message1.omemoElement());
     serializePacket(message1, xmlOut1);