From 29447baef7d211cfd98869de6c1a1d9b8abae18c Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Tue, 3 Jan 2023 23:43:48 +0100
Subject: E2eeExtension: Return encrypted stanzas as Message/Iq instead of XML

Part of #513.
---
 src/omemo/QXmppOmemoManager.cpp   | 22 +++++++++-------------
 src/omemo/QXmppOmemoManager_p.cpp |  6 +-----
 2 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'src/omemo')

diff --git a/src/omemo/QXmppOmemoManager.cpp b/src/omemo/QXmppOmemoManager.cpp
index af12879c..55a21190 100644
--- a/src/omemo/QXmppOmemoManager.cpp
+++ b/src/omemo/QXmppOmemoManager.cpp
@@ -1061,19 +1061,15 @@ QXmppTask<QXmppE2eeExtension::IqEncryptResult> Manager::encryptIq(QXmppIq &&iq,
                     SendError::EncryptionError });
 
             } else {
-                QXmppOmemoIq omemoIq;
-                omemoIq.setId(iq.id());
-                omemoIq.setType(iq.type());
-                omemoIq.setLang(iq.lang());
-                omemoIq.setFrom(iq.from());
-                omemoIq.setTo(iq.to());
-                omemoIq.setOmemoElement(*omemoElement);
-
-                QByteArray serializedEncryptedIq;
-                QXmlStreamWriter writer(&serializedEncryptedIq);
-                omemoIq.toXml(&writer);
-
-                interface.finish(serializedEncryptedIq);
+                auto omemoIq = std::make_unique<QXmppOmemoIq>();
+                omemoIq->setId(iq.id());
+                omemoIq->setType(iq.type());
+                omemoIq->setLang(iq.lang());
+                omemoIq->setFrom(iq.from());
+                omemoIq->setTo(iq.to());
+                omemoIq->setOmemoElement(*omemoElement);
+
+                interface.finish(std::move(omemoIq));
             }
         });
     }
diff --git a/src/omemo/QXmppOmemoManager_p.cpp b/src/omemo/QXmppOmemoManager_p.cpp
index 4e9d7840..485ef7b4 100644
--- a/src/omemo/QXmppOmemoManager_p.cpp
+++ b/src/omemo/QXmppOmemoManager_p.cpp
@@ -1090,11 +1090,7 @@ QXmppTask<QXmppE2eeExtension::MessageEncryptResult> ManagerPrivate::encryptMessa
 
                 message.setOmemoElement(omemoElement);
 
-                QByteArray serializedEncryptedMessage;
-                QXmlStreamWriter writer(&serializedEncryptedMessage);
-                message.toXml(&writer, QXmpp::ScePublic);
-
-                interface.finish(serializedEncryptedMessage);
+                interface.finish(std::make_unique<QXmppMessage>(std::move(message)));
             }
         });
     }
-- 
cgit v1.2.3