Call: Remove own IQ ack handling

Currently the acks (or missing acks) are not used. Also, the result
handling from Client::sendIq() should rather be used.

Author: lnjX

src/client/QXmppCall.cpp

@@ -207,16 +207,6 @@ QXmppCallStream *QXmppCallPrivate::findStreamById(int id)
     return nullptr;
 }
 
-void QXmppCallPrivate::handleAck(const QXmppIq &ack)
-{
-    auto request = std::ranges::find(requests, ack.id(), &QXmppJingleIq::id);
-    if (request != requests.end()) {
-        // process acknowledgement
-        q->debug(u"Received ACK for packet %1"_s.arg(ack.id()));
-        requests.erase(request);
-    }
-}
-
 bool QXmppCallPrivate::handleDescription(QXmppCallStream *stream, const QXmppJingleIq::Content &content)
 {
     stream->d->payloadTypes = content.payloadTypes();
@@ -372,7 +362,7 @@ void QXmppCallPrivate::handleRequest(const QXmppJingleIq &iq)
             iq.setAction(QXmppJingleIq::ContentReject);
             iq.setSid(q->sid());
             iq.reason().setType(QXmppJingleIq::Reason::FailedApplication);
-            sendRequest(iq);
+            manager->client()->sendIq(std::move(iq));
             streams.removeAll(stream);
             delete stream;
             return;
@@ -385,7 +375,7 @@ void QXmppCallPrivate::handleRequest(const QXmppJingleIq &iq)
         iq.setAction(QXmppJingleIq::ContentAccept);
         iq.setSid(q->sid());
         iq.addContent(localContent(stream));
-        sendRequest(iq);
+        manager->client()->sendIq(std::move(iq));
 
     } else if (iq.action() == QXmppJingleIq::TransportInfo) {
 
@@ -481,7 +471,7 @@ bool QXmppCallPrivate::sendAck(const QXmppJingleIq &iq)
     return manager->client()->sendPacket(ack);
 }
 
-bool QXmppCallPrivate::sendInvite()
+void QXmppCallPrivate::sendInvite()
 {
     // create audio stream
     QXmppCallStream *stream = findStreamByMedia(AUDIO_MEDIA);
@@ -494,16 +484,7 @@ bool QXmppCallPrivate::sendInvite()
     iq.setInitiator(ownJid);
     iq.setSid(sid);
     iq.addContent(localContent(stream));
-    return sendRequest(iq);
-}
-
-///
-/// Sends a Jingle IQ and adds it to outstanding requests.
-///
-bool QXmppCallPrivate::sendRequest(const QXmppJingleIq &iq)
-{
-    requests << iq;
-    return manager->client()->sendPacket(iq);
+    manager->client()->send(std::move(iq));
 }
 
 void QXmppCallPrivate::setState(QXmppCall::State newState)
@@ -587,7 +568,7 @@ void QXmppCall::accept()
         iq.setResponder(d->ownJid);
         iq.setSid(d->sid);
         iq.addContent(d->localContent(stream));
-        d->sendRequest(iq);
+        d->manager->client()->sendIq(std::move(iq));
 
         // notify user
         Q_EMIT d->manager->callStarted(this);
@@ -665,7 +646,7 @@ void QXmppCall::onLocalCandidatesChanged(QXmppCallStream *stream)
     iq.setAction(QXmppJingleIq::TransportInfo);
     iq.setSid(d->sid);
     iq.addContent(d->localContent(stream));
-    d->sendRequest(iq);
+    d->manager->client()->sendIq(std::move(iq));
 }
 
 ///
@@ -721,5 +702,5 @@ void QXmppCall::addVideo()
     iq.setAction(QXmppJingleIq::ContentAdd);
     iq.setSid(d->sid);
     iq.addContent(d->localContent(stream));
-    d->sendRequest(iq);
+    d->manager->client()->sendIq(std::move(iq));
 }

src/client/QXmppCallManager.cpp

@@ -10,6 +10,7 @@
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppJingleIq.h"
+#include "QXmppTask.h"
 #include "QXmppUtils.h"
 
 #include "StringLiterals.h"
@@ -95,9 +96,6 @@ void QXmppCallManager::onRegistered(QXmppClient *client)
     connect(client, &QXmppClient::disconnected,
             this, &QXmppCallManager::_q_disconnected);
 
-    connect(client, &QXmppClient::iqReceived,
-            this, &QXmppCallManager::_q_iqReceived);
-
     connect(client, &QXmppClient::presenceReceived,
             this, &QXmppCallManager::_q_presenceReceived);
 }
@@ -107,9 +105,6 @@ void QXmppCallManager::onUnregistered(QXmppClient *client)
     disconnect(client, &QXmppClient::disconnected,
                this, &QXmppCallManager::_q_disconnected);
 
-    disconnect(client, &QXmppClient::iqReceived,
-               this, &QXmppCallManager::_q_iqReceived);
-
     disconnect(client, &QXmppClient::presenceReceived,
                this, &QXmppCallManager::_q_presenceReceived);
 }
@@ -228,21 +223,6 @@ void QXmppCallManager::_q_disconnected()
     }
 }
 
-///
-/// Handles acknowledgements.
-///
-void QXmppCallManager::_q_iqReceived(const QXmppIq &ack)
-{
-    if (ack.type() != QXmppIq::Result) {
-        return;
-    }
-
-    // find request
-    for (auto *call : std::as_const(d->calls)) {
-        call->d->handleAck(ack);
-    }
-}
-
 ///
 /// Handles a Jingle IQ.
 ///
@@ -292,7 +272,7 @@ void QXmppCallManager::_q_jingleIqReceived(const QXmppJingleIq &iq)
         ringing.setType(QXmppIq::Set);
         ringing.setSid(call->sid());
         ringing.setRtpSessionState(QXmppJingleIq::RtpSessionStateRinging());
-        call->d->sendRequest(ringing);
+        client()->sendIq(std::move(ringing));
 
         // notify user
         Q_EMIT callReceived(call);

src/client/QXmppCallManager.h

@@ -82,7 +82,6 @@ public Q_SLOTS:
 private Q_SLOTS:
     void _q_callDestroyed(QObject *object);
     void _q_disconnected();
-    void _q_iqReceived(const QXmppIq &iq);
     void _q_jingleIqReceived(const QXmppJingleIq &iq);
     void _q_presenceReceived(const QXmppPresence &presence);
 

src/client/QXmppCall_p.h

@@ -62,21 +62,18 @@ class QXmppCallPrivate : public QObject
     QXmppCallStream *findStreamById(int id);
     QXmppJingleIq::Content localContent(QXmppCallStream *stream) const;
 
-    void handleAck(const QXmppIq &iq);
     bool handleDescription(QXmppCallStream *stream, const QXmppJingleIq::Content &content);
     void handleRequest(const QXmppJingleIq &iq);
     bool handleTransport(QXmppCallStream *stream, const QXmppJingleIq::Content &content);
     void setState(QXmppCall::State state);
     bool sendAck(const QXmppJingleIq &iq);
-    bool sendInvite();
-    bool sendRequest(const QXmppJingleIq &iq);
+    void sendInvite();
     void terminate(QXmppJingleIq::Reason::Type reasonType);
 
     QXmppCall::Direction direction;
     QString jid;
     QString ownJid;
     QXmppCallManager *manager;
-    QList<QXmppJingleIq> requests;
     QString sid;
     QXmppCall::State state;