From a69475d8b196605b19e532d62d1fc375630ea8f1 Mon Sep 17 00:00:00 2001
From: Melvin Keskin <melvo@olomono.de>
Date: Thu, 27 Jan 2022 16:52:54 +0000
Subject: OmemoElement: Omit payload XML element if empty

---
 src/base/QXmppOmemoData.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/base/QXmppOmemoData.cpp')

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
 }
-- 
cgit v1.2.3