aboutsummaryrefslogtreecommitdiff
path: root/src/client/QXmppAtmManager.h
diff options
context:
space:
mode:
authorMelvin Keskin <melvo@olomono.de>2021-10-07 16:35:50 +0200
committerLinus Jahn <lnj@kaidan.im>2021-10-10 20:12:46 +0200
commite4970a79535dd5cfff2d010049cf39b644a87850 (patch)
treef274962b1063012ce0482e9e7328070bec69fba0 /src/client/QXmppAtmManager.h
parente1836d08b2f659d2ac5c98280e08d96c8df60d88 (diff)
downloadqxmpp-e4970a79535dd5cfff2d010049cf39b644a87850.tar.gz
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
Diffstat (limited to 'src/client/QXmppAtmManager.h')
-rw-r--r--src/client/QXmppAtmManager.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/client/QXmppAtmManager.h b/src/client/QXmppAtmManager.h
index 2df2dfce..3b65d9db 100644
--- a/src/client/QXmppAtmManager.h
+++ b/src/client/QXmppAtmManager.h
@@ -36,7 +36,7 @@ class QXMPP_EXPORT QXmppAtmManager : public QXmppClientExtension
public:
QXmppAtmManager(QXmppTrustStorage *trustStorage);
- QFuture<void> makeTrustDecisions(const QString &encryption, const QString &keyOwnerJid, const QList<QString> &keyIdsForAuthentication, const QList<QString> &keyIdsForDistrusting = {});
+ QFuture<void> makeTrustDecisions(const QString &encryption, const QString &keyOwnerJid, const QList<QByteArray> &keyIdsForAuthentication, const QList<QByteArray> &keyIdsForDistrusting = {});
/// \cond
bool handleStanza(const QDomElement &stanza) override;
@@ -49,14 +49,14 @@ private slots:
/// \endcond
private:
- QFuture<void> makeTrustDecisions(const QString &encryption, const QMultiHash<QString, QString> &keyIdsForAuthentication, const QMultiHash<QString, QString> &keyIdsForDistrusting);
+ QFuture<void> makeTrustDecisions(const QString &encryption, const QMultiHash<QString, QByteArray> &keyIdsForAuthentication, const QMultiHash<QString, QByteArray> &keyIdsForDistrusting);
QFuture<void> handleMessage(const QXmppMessage &message);
- QFuture<void> authenticate(const QString &encryption, const QMultiHash<QString, QString> &keyIds);
- QFuture<void> distrust(const QString &encryption, const QMultiHash<QString, QString> &keyIds);
+ QFuture<void> authenticate(const QString &encryption, const QMultiHash<QString, QByteArray> &keyIds);
+ QFuture<void> distrust(const QString &encryption, const QMultiHash<QString, QByteArray> &keyIds);
QFuture<void> distrustAutomaticallyTrustedKeys(const QString &encryption, const QList<QString> &keyOwnerJids);
- QFuture<void> makePostponedTrustDecisions(const QString &encryption, const QList<QString> &senderKeyIds);
+ QFuture<void> makePostponedTrustDecisions(const QString &encryption, const QList<QByteArray> &senderKeyIds);
QFuture<QXmpp::SendResult> sendTrustMessage(const QString &encryption, const QList<QXmppTrustMessageKeyOwner> &keyOwners, const QString &recipientJid);