From 8283bcff0b142e2f40daa82a452b002b61952000 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Sat, 28 Jan 2023 17:58:01 +0100 Subject: Client: Rename send/sendUnencrypted to sendSensitive/send --- src/client/QXmppAtmManager.cpp | 2 +- src/client/QXmppClient.cpp | 10 +++++----- src/client/QXmppClient.h | 2 +- src/client/QXmppRosterManager.cpp | 4 ++-- src/omemo/QXmppOmemoManager_p.cpp | 2 +- tests/qxmppclient/tst_qxmppclient.cpp | 8 ++++---- tests/qxmppomemomanager/tst_qxmppomemomanager.cpp | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/client/QXmppAtmManager.cpp b/src/client/QXmppAtmManager.cpp index e6df2679..8ec0fdc6 100644 --- a/src/client/QXmppAtmManager.cpp +++ b/src/client/QXmppAtmManager.cpp @@ -492,5 +492,5 @@ QXmppTask QXmppAtmManager::sendTrustMessage(const QString &en QXmppSendStanzaParams params; params.setAcceptedTrustLevels(TrustLevel::Authenticated); - return client()->send(std::move(message), params); + return client()->sendSensitive(std::move(message), params); } diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp index 891de237..747e7200 100644 --- a/src/client/QXmppClient.cpp +++ b/src/client/QXmppClient.cpp @@ -399,7 +399,7 @@ bool QXmppClient::sendPacket(const QXmppNonza &packet) /// /// If stream management is enabled, the future continues to be active until the /// server acknowledges the packet. On success, QXmpp::SendSuccess with -/// acknowledged == true is reported and the future finishes. +/// acknowledged == true is reported. /// /// If connection errors occur, the packet is resent if possible. If /// reconnecting is not possible, an error is reported. @@ -410,7 +410,7 @@ bool QXmppClient::sendPacket(const QXmppNonza &packet) /// /// \since QXmpp 1.5 /// -QXmppTask QXmppClient::send(QXmppStanza &&stanza, const std::optional ¶ms) +QXmppTask QXmppClient::sendSensitive(QXmppStanza &&stanza, const std::optional ¶ms) { const auto sendEncrypted = [this](QXmppTask &&future) { QXmppPromise interface; @@ -454,7 +454,7 @@ QXmppTask QXmppClient::send(QXmppStanza &&stanza, const std:: /// /// \since QXmpp 1.5 /// -QXmppTask QXmppClient::sendUnencrypted(QXmppStanza &&stanza, const std::optional &) +QXmppTask QXmppClient::send(QXmppStanza &&stanza, const std::optional &) { return d->stream->send(stanza); } @@ -473,9 +473,9 @@ QXmppTask QXmppClient::reply(QXmppStanza &&stanza, const std: // This should pick the right e2ee manager as soon as multiple encryptions // in parallel are supported. if (e2eeMetadata) { - return send(std::move(stanza), params); + return sendSensitive(std::move(stanza), params); } - return sendUnencrypted(std::move(stanza), params); + return send(std::move(stanza), params); } /// diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h index ca33afb6..31a99030 100644 --- a/src/client/QXmppClient.h +++ b/src/client/QXmppClient.h @@ -219,8 +219,8 @@ public: State state() const; QXmppStanza::Error::Condition xmppStreamError(); + QXmppTask sendSensitive(QXmppStanza &&, const std::optional & = {}); QXmppTask send(QXmppStanza &&, const std::optional & = {}); - QXmppTask sendUnencrypted(QXmppStanza &&, const std::optional & = {}); QXmppTask reply(QXmppStanza &&stanza, const std::optional &e2eeMetadata, const std::optional & = {}); QXmppTask sendIq(QXmppIq &&, const std::optional & = {}); QXmppTask sendSensitiveIq(QXmppIq &&, const std::optional & = {}); diff --git a/src/client/QXmppRosterManager.cpp b/src/client/QXmppRosterManager.cpp index 04b74c43..c02d2211 100644 --- a/src/client/QXmppRosterManager.cpp +++ b/src/client/QXmppRosterManager.cpp @@ -341,7 +341,7 @@ QXmppTask QXmppRosterManager::subscribeTo(const QString &bare packet.setTo(QXmppUtils::jidToBareJid(bareJid)); packet.setType(QXmppPresence::Subscribe); packet.setStatusText(reason); - return client()->send(std::move(packet)); + return client()->sendSensitive(std::move(packet)); } /// @@ -358,7 +358,7 @@ QXmppTask QXmppRosterManager::unsubscribeFrom(const QString & packet.setTo(QXmppUtils::jidToBareJid(bareJid)); packet.setType(QXmppPresence::Unsubscribe); packet.setStatusText(reason); - return client()->send(std::move(packet)); + return client()->sendSensitive(std::move(packet)); } /// diff --git a/src/omemo/QXmppOmemoManager_p.cpp b/src/omemo/QXmppOmemoManager_p.cpp index dea38c13..4e9d7840 100644 --- a/src/omemo/QXmppOmemoManager_p.cpp +++ b/src/omemo/QXmppOmemoManager_p.cpp @@ -3629,7 +3629,7 @@ QXmppTask ManagerPrivate::sendEmptyMessage(const QString &rec message.addHint(QXmppMessage::Store); message.setOmemoElement(omemoElement); - auto future = q->client()->sendUnencrypted(std::move(message)); + auto future = q->client()->send(std::move(message)); future.then(q, [=](QXmpp::SendResult result) mutable { interface.finish(std::move(result)); }); diff --git a/tests/qxmppclient/tst_qxmppclient.cpp b/tests/qxmppclient/tst_qxmppclient.cpp index a18fa0d2..c51fe047 100644 --- a/tests/qxmppclient/tst_qxmppclient.cpp +++ b/tests/qxmppclient/tst_qxmppclient.cpp @@ -129,14 +129,14 @@ void tst_QXmppClient::testE2eeExtension() EncryptionExtension encrypter; client.setEncryptionExtension(&encrypter); - auto result = client.send(QXmppMessage("me@qxmpp.org", "somebody@qxmpp.org", "Hello")); + auto result = client.sendSensitive(QXmppMessage("me@qxmpp.org", "somebody@qxmpp.org", "Hello")); QVERIFY(encrypter.messageCalled); QVERIFY(!encrypter.iqCalled); QCoreApplication::processEvents(); expectFutureVariant(result.toFuture(this)); encrypter.messageCalled = false; - result = client.send(QXmppPresence(QXmppPresence::Available)); + result = client.sendSensitive(QXmppPresence(QXmppPresence::Available)); QVERIFY(!encrypter.messageCalled); QVERIFY(!encrypter.iqCalled); @@ -148,11 +148,11 @@ void tst_QXmppClient::testE2eeExtension() return request; }; - client.send(createRequest()); + client.sendSensitive(createRequest()); QVERIFY(encrypter.iqCalled); encrypter.iqCalled = false; - client.sendUnencrypted(createRequest()); + client.send(createRequest()); QVERIFY(!encrypter.iqCalled); encrypter.iqCalled = false; diff --git a/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp b/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp index 85a4792b..d276a626 100644 --- a/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp +++ b/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp @@ -328,7 +328,7 @@ void tst_QXmppOmemoManager::testSendMessage() if (const auto optionalOmemoElement = message.omemoElement(); optionalOmemoElement && optionalOmemoElement.value().payload().isEmpty()) { isEmptyOmemoMessageReceivedByAlice1 = true; - auto future = m_alice1.client.send(std::move(message2), QXmppSendStanzaParams()); + auto future = m_alice1.client.sendSensitive(std::move(message2), QXmppSendStanzaParams()); future.then(this, [=, &isSecondMessageSentByAlice1](QXmpp::SendResult result) { if (std::get_if(&result)) { isSecondMessageSentByAlice1 = true; @@ -344,7 +344,7 @@ void tst_QXmppOmemoManager::testSendMessage() connect(m_alice1.manager, &QXmppOmemoManager::deviceAdded, &context, [=, &isFirstMessageSentByAlice1](const QString &jid, uint32_t) mutable { if (jid == m_alice2.client.configuration().jidBare()) { if (!isFirstMessageSentByAlice1) { - auto future = m_alice1.client.send(std::move(message1), QXmppSendStanzaParams()); + auto future = m_alice1.client.sendSensitive(std::move(message1), QXmppSendStanzaParams()); future.then(this, [=, &isFirstMessageSentByAlice1](QXmpp::SendResult result) { if (std::get_if(&result)) { isFirstMessageSentByAlice1 = true; -- cgit v1.2.3