aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLinus Jahn <lnj@kaidan.im>2023-01-22 19:25:35 +0100
committerLinus Jahn <lnj@kaidan.im>2023-01-22 19:27:12 +0100
commit2395e3cd3f087bd05c5cec94b95c73231383054b (patch)
treee879fd477fb8a51940bfc4465e34219e34a23e37 /src
parentf5f3909771ac7b07e79c04171d9f5fc79831b891 (diff)
downloadqxmpp-2395e3cd3f087bd05c5cec94b95c73231383054b.tar.gz
Fix discovery manager incoming request handling
Fixes #529.
Diffstat (limited to 'src')
-rw-r--r--src/client/QXmppIqHandling.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/QXmppIqHandling.h b/src/client/QXmppIqHandling.h
index 530e214b..0782dd89 100644
--- a/src/client/QXmppIqHandling.h
+++ b/src/client/QXmppIqHandling.h
@@ -55,7 +55,7 @@ namespace Private {
const std::optional<QXmppE2eeMetadata> &e2eeMetadata,
QXmppTask<T> future)
{
- Private::await(future, client, [client, requestId, requestFrom, e2eeMetadata](T result) {
+ future.then(client, [client, requestId, requestFrom, e2eeMetadata](T result) {
processHandleIqResult(client, requestId, requestFrom, e2eeMetadata, result);
});
}
@@ -97,6 +97,7 @@ namespace Private {
client,
iq.id(),
iq.from(),
+ e2eeMetadata,
invokeIqHandler(std::forward<Handler>(handler), std::move(iq)));
return true;
}
@@ -271,7 +272,7 @@ bool handleIqRequests(const QDomElement &element,
template<typename... IqTypes, typename Handler>
bool handleIqRequests(const QDomElement &element, QXmppClient *client, Handler handler)
{
- return handleIqRequests(element, std::nullopt, client, std::forward<Handler>(handler));
+ return handleIqRequests<IqTypes...>(element, std::nullopt, client, std::forward<Handler>(handler));
}
} // namespace QXmpp