diff options
| author | Linus Jahn <lnj@kaidan.im> | 2023-01-28 17:58:01 +0100 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2023-01-28 17:58:01 +0100 |
| commit | 8283bcff0b142e2f40daa82a452b002b61952000 (patch) | |
| tree | 2e70406c07564de9f8388dead6a157af564c9300 /src/client | |
| parent | 0c8209919cf13691fd9e2a1306a28259c1ca1657 (diff) | |
Client: Rename send/sendUnencrypted to sendSensitive/send
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/QXmppAtmManager.cpp | 2 | ||||
| -rw-r--r-- | src/client/QXmppClient.cpp | 10 | ||||
| -rw-r--r-- | src/client/QXmppClient.h | 2 | ||||
| -rw-r--r-- | src/client/QXmppRosterManager.cpp | 4 |
4 files changed, 9 insertions, 9 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<QXmpp::SendResult> 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<QXmpp::SendResult> QXmppClient::send(QXmppStanza &&stanza, const std::optional<QXmppSendStanzaParams> ¶ms) +QXmppTask<QXmpp::SendResult> QXmppClient::sendSensitive(QXmppStanza &&stanza, const std::optional<QXmppSendStanzaParams> ¶ms) { const auto sendEncrypted = [this](QXmppTask<MessageEncryptResult> &&future) { QXmppPromise<QXmpp::SendResult> interface; @@ -454,7 +454,7 @@ QXmppTask<QXmpp::SendResult> QXmppClient::send(QXmppStanza &&stanza, const std:: /// /// \since QXmpp 1.5 /// -QXmppTask<QXmpp::SendResult> QXmppClient::sendUnencrypted(QXmppStanza &&stanza, const std::optional<QXmppSendStanzaParams> &) +QXmppTask<QXmpp::SendResult> QXmppClient::send(QXmppStanza &&stanza, const std::optional<QXmppSendStanzaParams> &) { return d->stream->send(stanza); } @@ -473,9 +473,9 @@ QXmppTask<QXmpp::SendResult> 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<QXmpp::SendResult> sendSensitive(QXmppStanza &&, const std::optional<QXmppSendStanzaParams> & = {}); QXmppTask<QXmpp::SendResult> send(QXmppStanza &&, const std::optional<QXmppSendStanzaParams> & = {}); - QXmppTask<QXmpp::SendResult> sendUnencrypted(QXmppStanza &&, const std::optional<QXmppSendStanzaParams> & = {}); QXmppTask<QXmpp::SendResult> reply(QXmppStanza &&stanza, const std::optional<QXmppE2eeMetadata> &e2eeMetadata, const std::optional<QXmppSendStanzaParams> & = {}); QXmppTask<IqResult> sendIq(QXmppIq &&, const std::optional<QXmppSendStanzaParams> & = {}); QXmppTask<IqResult> sendSensitiveIq(QXmppIq &&, const std::optional<QXmppSendStanzaParams> & = {}); 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<QXmpp::SendResult> 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<QXmpp::SendResult> 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)); } /// |
