From e4970a79535dd5cfff2d010049cf39b644a87850 Mon Sep 17 00:00:00 2001
From: Melvin Keskin <melvo@olomono.de>
Date: Thu, 7 Oct 2021 16:35:50 +0200
Subject: Update to OMEMO 0.8, TM 0.6 and ATM 0.4

* OMEMO has namespace 'urn:xmpp:omemo:2' and uses SCE 0.4 now
* TM has namespace 'urn:xmpp:tm:1' and uses Base64 for key identifiers
* ATM uses Base64 for key identifiers
---
 src/base/QXmppTrustMessages.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/src/base/QXmppTrustMessages.cpp b/src/base/QXmppTrustMessages.cpp
index 621fb5dd..ce76ab26 100644
--- a/src/base/QXmppTrustMessages.cpp
+++ b/src/base/QXmppTrustMessages.cpp
@@ -200,8 +200,8 @@ class QXmppTrustMessageKeyOwnerPrivate : public QSharedData
 {
 public:
     QString jid;
-    QList<QString> trustedKeys;
-    QList<QString> distrustedKeys;
+    QList<QByteArray> trustedKeys;
+    QList<QByteArray> distrustedKeys;
 };
 
 ///
@@ -255,7 +255,7 @@ void QXmppTrustMessageKeyOwner::setJid(const QString &jid)
 ///
 /// \return the IDs of trusted keys
 ///
-QList<QString> QXmppTrustMessageKeyOwner::trustedKeys() const
+QList<QByteArray> QXmppTrustMessageKeyOwner::trustedKeys() const
 {
     return d->trustedKeys;
 }
@@ -265,7 +265,7 @@ QList<QString> QXmppTrustMessageKeyOwner::trustedKeys() const
 ///
 /// \param keyIds IDs of trusted keys
 ///
-void QXmppTrustMessageKeyOwner::setTrustedKeys(const QList<QString> &keyIds)
+void QXmppTrustMessageKeyOwner::setTrustedKeys(const QList<QByteArray> &keyIds)
 {
     d->trustedKeys = keyIds;
 }
@@ -275,7 +275,7 @@ void QXmppTrustMessageKeyOwner::setTrustedKeys(const QList<QString> &keyIds)
 ///
 /// \return the IDs of distrusted keys
 ///
-QList<QString> QXmppTrustMessageKeyOwner::distrustedKeys() const
+QList<QByteArray> QXmppTrustMessageKeyOwner::distrustedKeys() const
 {
     return d->distrustedKeys;
 }
@@ -285,7 +285,7 @@ QList<QString> QXmppTrustMessageKeyOwner::distrustedKeys() const
 ///
 /// \param keyIds IDs of distrusted keys
 ///
-void QXmppTrustMessageKeyOwner::setDistrustedKeys(const QList<QString> &keyIds)
+void QXmppTrustMessageKeyOwner::setDistrustedKeys(const QList<QByteArray> &keyIds)
 {
     d->distrustedKeys = keyIds;
 }
@@ -298,10 +298,10 @@ void QXmppTrustMessageKeyOwner::parse(const QDomElement &element)
     for (auto childElement = element.firstChildElement();
          !childElement.isNull();
          childElement = childElement.nextSiblingElement()) {
-        if (childElement.tagName() == "trust") {
-            d->trustedKeys.append(childElement.text());
-        } else if (childElement.tagName() == "distrust") {
-            d->distrustedKeys.append(childElement.text());
+        if (const auto tagName = childElement.tagName(); tagName == "trust") {
+            d->trustedKeys.append(QByteArray::fromBase64(childElement.text().toLatin1()));
+        } else if (tagName == "distrust") {
+            d->distrustedKeys.append(QByteArray::fromBase64(childElement.text().toLatin1()));
         }
     }
 }
@@ -312,11 +312,11 @@ void QXmppTrustMessageKeyOwner::toXml(QXmlStreamWriter *writer) const
     writer->writeAttribute("jid", d->jid);
 
     for (const auto &keyIdentifier : d->trustedKeys) {
-        writer->writeTextElement("trust", keyIdentifier);
+        writer->writeTextElement("trust", keyIdentifier.toBase64());
     }
 
     for (const auto &keyIdentifier : d->distrustedKeys) {
-        writer->writeTextElement("distrust", keyIdentifier);
+        writer->writeTextElement("distrust", keyIdentifier.toBase64());
     }
 
     writer->writeEndElement();
-- 
cgit v1.2.3