[add] unit test [add] comment [update] code order to if else statement

1 files changed, 18 insertions, 14 deletions

diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp
index 600fe47c..0ee4be20 100644
--- a/src/base/QXmppMessage.cpp
+++ b/src/base/QXmppMessage.cpp
@@ -501,6 +501,15 @@ void QXmppMessage::parse(const QDomElement &element)
     }
     d->receiptRequested = element.firstChildElement("request").namespaceURI() == ns_message_receipts;
 
+    // XEP-0203: Delayed Delivery
+    QDomElement delayElement = element.firstChildElement("delay");
+    if (!delayElement.isNull() && delayElement.namespaceURI() == ns_delayed_delivery)
+    {
+        const QString str = delayElement.attribute("stamp");
+        d->stamp = QXmppUtils::datetimeFromString(str);
+        d->stampType = DelayedDelivery;
+    }
+
     // XEP-0224: Attention
     d->attentionRequested = element.firstChildElement("attention").namespaceURI() == ns_attention;
 
@@ -544,11 +553,15 @@ void QXmppMessage::parse(const QDomElement &element)
         {
             if (xElement.namespaceURI() == ns_legacy_delayed_delivery)
             {
-                // XEP-0091: Legacy Delayed Delivery
-                const QString str = xElement.attribute("stamp");
-                d->stamp = QDateTime::fromString(str, "yyyyMMddThh:mm:ss");
-                d->stamp.setTimeSpec(Qt::UTC);
-                d->stampType = LegacyDelayedDelivery;
+                // if XEP-0203 exists, XEP-0091 has no need to parse because XEP-0091 is no more standard protocol)
+                if (d->stamp.isNull())
+                {
+                    // XEP-0091: Legacy Delayed Delivery
+                    const QString str = xElement.attribute("stamp");
+                    d->stamp = QDateTime::fromString(str, "yyyyMMddThh:mm:ss");
+                    d->stamp.setTimeSpec(Qt::UTC);
+                    d->stampType = LegacyDelayedDelivery;
+                }
             } else if (xElement.namespaceURI() == ns_conference) {
                 // XEP-0249: Direct MUC Invitations
                 d->mucInvitationJid = xElement.attribute("jid");
@@ -566,15 +579,6 @@ void QXmppMessage::parse(const QDomElement &element)
         xElement = xElement.nextSiblingElement();
     }
     setExtensions(extensions);
-
-    // XEP-0203: Delayed Delivery
-    QDomElement delayElement = element.firstChildElement("delay");
-    if (!delayElement.isNull() && delayElement.namespaceURI() == ns_delayed_delivery)
-    {
-        const QString str = delayElement.attribute("stamp");
-        d->stamp = QXmppUtils::datetimeFromString(str);
-        d->stampType = DelayedDelivery;
-    }
 }
 
 void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const