managers: Use onRegistered()/onUnregistered() instead of setClient()

src/client/QXmppAtmManager.cpp

@@ -244,12 +244,16 @@ QXmppTask<void> QXmppAtmManager::makeTrustDecisions(const QString &encryption, c
 }
 
 /// \cond
-void QXmppAtmManager::setClient(QXmppClient *client)
+void QXmppAtmManager::onRegistered(QXmppClient *client)
 {
-    QXmppClientExtension::setClient(client);
     connect(client, &QXmppClient::messageReceived, this, &QXmppAtmManager::handleMessageReceived);
 }
 
+void QXmppAtmManager::onUnregistered(QXmppClient *client)
+{
+    disconnect(client, &QXmppClient::messageReceived, this, &QXmppAtmManager::handleMessageReceived);
+}
+
 void QXmppAtmManager::handleMessageReceived(const QXmppMessage &message)
 {
     handleMessage(message);

src/client/QXmppAtmManager.h

@@ -24,7 +24,8 @@ class QXMPP_EXPORT QXmppAtmManager : public QXmppTrustManager
 
 protected:
     /// \cond
-    void setClient(QXmppClient *client) override;
+    void onRegistered(QXmppClient *client) override;
+    void onUnregistered(QXmppClient *client) override;
 
 private:
     Q_SLOT void handleMessageReceived(const QXmppMessage &message);

src/client/QXmppAttentionManager.cpp

@@ -183,14 +183,18 @@ QString QXmppAttentionManager::requestAttention(const QString &jid, const QStrin
     return {};
 }
 
-void QXmppAttentionManager::setClient(QXmppClient *client)
+void QXmppAttentionManager::onRegistered(QXmppClient *client)
 {
-    QXmppClientExtension::setClient(client);
-
     connect(client, &QXmppClient::messageReceived,
             this, &QXmppAttentionManager::handleMessageReceived);
 }
 
+void QXmppAttentionManager::onUnregistered(QXmppClient *client)
+{
+    disconnect(client, &QXmppClient::messageReceived,
+               this, &QXmppAttentionManager::handleMessageReceived);
+}
+
 void QXmppAttentionManager::handleMessageReceived(const QXmppMessage &message)
 {
     if (!message.isAttentionRequested() || !message.stamp().isNull()) {

src/client/QXmppAttentionManager.h

@@ -36,7 +36,8 @@ public Q_SLOTS:
     void attentionRequestRateLimited(const QXmppMessage &message);
 
 protected:
-    void setClient(QXmppClient *client) override;
+    void onRegistered(QXmppClient *client) override;
+    void onUnregistered(QXmppClient *client) override;
 
 private Q_SLOTS:
     void handleMessageReceived(const QXmppMessage &message);

src/client/QXmppBlockingManager.cpp

@@ -355,16 +355,14 @@ QStringList QXmppBlockingManager::discoveryFeatures() const
     return { XMLNS_BLOCKING.toString() };
 }
 
-void QXmppBlockingManager::setClient(QXmppClient *newClient)
+void QXmppBlockingManager::onRegistered(QXmppClient *client)
 {
-    // disconnect from old client
-    if (client()) {
-        disconnect(client(), &QXmppClient::connected, this, &QXmppBlockingManager::onConnected);
-    }
-
-    QXmppClientExtension::setClient(newClient);
+    connect(client, &QXmppClient::connected, this, &QXmppBlockingManager::onConnected);
+}
 
-    connect(client(), &QXmppClient::connected, this, &QXmppBlockingManager::onConnected);
+void QXmppBlockingManager::onUnregistered(QXmppClient *oldClient)
+{
+    disconnect(oldClient, &QXmppClient::connected, this, &QXmppBlockingManager::onConnected);
 }
 
 bool QXmppBlockingManager::handleStanza(const QDomElement &stanza, const std::optional<QXmppE2eeMetadata> &)

src/client/QXmppBlockingManager.h

@@ -73,7 +73,8 @@ class QXMPP_EXPORT QXmppBlockingManager : public QXmppClientExtension
 
     /// \cond
     QStringList discoveryFeatures() const override;
-    void setClient(QXmppClient *) override;
+    void onRegistered(QXmppClient *) override;
+    void onUnregistered(QXmppClient *) override;
     bool handleStanza(const QDomElement &, const std::optional<QXmppE2eeMetadata> &) override;
     /// \endcond
 

src/client/QXmppBookmarkManager.cpp

@@ -124,18 +124,6 @@ bool QXmppBookmarkManager::setBookmarks(const QXmppBookmarkSet &bookmarks)
 }
 
 /// \cond
-void QXmppBookmarkManager::setClient(QXmppClient *client)
-{
-
-    QXmppClientExtension::setClient(client);
-
-    connect(client, &QXmppClient::connected,
-            this, &QXmppBookmarkManager::slotConnected);
-
-    connect(client, &QXmppClient::disconnected,
-            this, &QXmppBookmarkManager::slotDisconnected);
-}
-
 bool QXmppBookmarkManager::handleStanza(const QDomElement &stanza)
 {
     if (stanza.tagName() == u"iq") {
@@ -162,6 +150,24 @@ bool QXmppBookmarkManager::handleStanza(const QDomElement &stanza)
     }
     return false;
 }
+
+void QXmppBookmarkManager::onRegistered(QXmppClient *client)
+{
+    connect(client, &QXmppClient::connected,
+            this, &QXmppBookmarkManager::slotConnected);
+
+    connect(client, &QXmppClient::disconnected,
+            this, &QXmppBookmarkManager::slotDisconnected);
+}
+
+void QXmppBookmarkManager::onUnregistered(QXmppClient *client)
+{
+    disconnect(client, &QXmppClient::connected,
+               this, &QXmppBookmarkManager::slotConnected);
+
+    disconnect(client, &QXmppClient::disconnected,
+               this, &QXmppBookmarkManager::slotDisconnected);
+}
 /// \endcond
 
 void QXmppBookmarkManager::slotConnected()

src/client/QXmppBookmarkManager.h

@@ -38,7 +38,8 @@ class QXMPP_EXPORT QXmppBookmarkManager : public QXmppClientExtension
 
 protected:
     /// \cond
-    void setClient(QXmppClient *client) override;
+    void onRegistered(QXmppClient *client) override;
+    void onUnregistered(QXmppClient *client) override;
     /// \endcond
 
 private Q_SLOTS:

src/client/QXmppCallInviteManager.cpp

@@ -295,11 +295,6 @@ bool QXmppCallInviteManager::handleMessage(const QXmppMessage &message)
 
     return false;
 }
-
-void QXmppCallInviteManager::setClient(QXmppClient *client)
-{
-    QXmppClientExtension::setClient(client);
-}
 /// \endcond
 
 ///

src/client/QXmppCallInviteManager.h

@@ -89,7 +89,6 @@ class QXMPP_EXPORT QXmppCallInviteManager : public QXmppClientExtension, public
 protected:
     /// \cond
     bool handleMessage(const QXmppMessage &) override;
-    void setClient(QXmppClient *client) override;
     /// \endcond
 
 private:

src/client/QXmppCallManager.cpp

@@ -91,10 +91,8 @@ bool QXmppCallManager::handleStanza(const QDomElement &element)
     return false;
 }
 
-void QXmppCallManager::setClient(QXmppClient *client)
+void QXmppCallManager::onRegistered(QXmppClient *client)
 {
-    QXmppClientExtension::setClient(client);
-
     connect(client, &QXmppClient::disconnected,
             this, &QXmppCallManager::_q_disconnected);
 
@@ -104,6 +102,18 @@ void QXmppCallManager::setClient(QXmppClient *client)
     connect(client, &QXmppClient::presenceReceived,
             this, &QXmppCallManager::_q_presenceReceived);
 }
+
+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);
+}
 /// \endcond
 
 ///

src/client/QXmppCallManager.h

@@ -75,7 +75,8 @@ public Q_SLOTS:
 
 protected:
     /// \cond
-    void setClient(QXmppClient *client) override;
+    void onRegistered(QXmppClient *client) override;
+    void onUnregistered(QXmppClient *client) override;
     /// \endcond
 
 private Q_SLOTS:

src/client/QXmppCarbonManagerV2.cpp

@@ -121,14 +121,14 @@ bool QXmppCarbonManagerV2::handleStanza(const QDomElement &element, const std::o
     return true;
 }
 
-void QXmppCarbonManagerV2::setClient(QXmppClient *newClient)
+void QXmppCarbonManagerV2::onRegistered(QXmppClient *client)
 {
-    if (client()) {
-        disconnect(client(), &QXmppClient::connected, this, &QXmppCarbonManagerV2::enableCarbons);
-    }
+    connect(client, &QXmppClient::connected, this, &QXmppCarbonManagerV2::enableCarbons);
+}
 
-    QXmppClientExtension::setClient(newClient);
-    connect(newClient, &QXmppClient::connected, this, &QXmppCarbonManagerV2::enableCarbons);
+void QXmppCarbonManagerV2::onUnregistered(QXmppClient *client)
+{
+    disconnect(client, &QXmppClient::connected, this, &QXmppCarbonManagerV2::enableCarbons);
 }
 
 void QXmppCarbonManagerV2::enableCarbons()

src/client/QXmppCarbonManagerV2.h

@@ -17,7 +17,8 @@ class QXMPP_EXPORT QXmppCarbonManagerV2 : public QXmppClientExtension
     bool handleStanza(const QDomElement &, const std::optional<QXmppE2eeMetadata> &) override;
 
 protected:
-    void setClient(QXmppClient *client) override;
+    void onRegistered(QXmppClient *client) override;
+    void onUnregistered(QXmppClient *client) override;
 
 private:
     void enableCarbons();

src/client/QXmppJingleMessageInitiationManager.cpp

@@ -313,11 +313,6 @@ bool QXmppJingleMessageInitiationManager::handleMessage(const QXmppMessage &mess
 
     return false;
 }
-
-void QXmppJingleMessageInitiationManager::setClient(QXmppClient *client)
-{
-    QXmppClientExtension::setClient(client);
-}
 /// \endcond
 
 ///

src/client/QXmppJingleMessageInitiationManager.h

@@ -94,7 +94,6 @@ class QXMPP_EXPORT QXmppJingleMessageInitiationManager : public QXmppClientExten
 protected:
     /// \cond
     bool handleMessage(const QXmppMessage &) override;
-    void setClient(QXmppClient *client) override;
     /// \endcond
 
 private:

src/client/QXmppMucManager.cpp

@@ -120,13 +120,17 @@ bool QXmppMucManager::handleStanza(const QDomElement &element)
     return false;
 }
 
-void QXmppMucManager::setClient(QXmppClient *client)
+void QXmppMucManager::onRegistered(QXmppClient *client)
 {
-    QXmppClientExtension::setClient(client);
-
     connect(client, &QXmppClient::messageReceived,
             this, &QXmppMucManager::_q_messageReceived);
 }
+
+void QXmppMucManager::onUnregistered(QXmppClient *client)
+{
+    disconnect(client, &QXmppClient::messageReceived,
+               this, &QXmppMucManager::_q_messageReceived);
+}
 /// \endcond
 
 void QXmppMucManager::_q_messageReceived(const QXmppMessage &msg)

src/client/QXmppMucManager.h

@@ -16,6 +16,7 @@ class QXmppMucManagerPrivate;
 class QXmppMucRoom;
 class QXmppMucRoomPrivate;
 
+///
 /// \brief The QXmppMucManager class makes it possible to interact with
 /// multi-user chat rooms as defined by \xep{0045}: Multi-User Chat.
 ///
@@ -36,7 +37,7 @@ class QXmppMucRoomPrivate;
 /// \endcode
 ///
 /// \ingroup Managers
-
+///
 class QXMPP_EXPORT QXmppMucManager : public QXmppClientExtension
 {
     Q_OBJECT
@@ -67,7 +68,8 @@ class QXMPP_EXPORT QXmppMucManager : public QXmppClientExtension
 
 protected:
     /// \cond
-    void setClient(QXmppClient *client) override;
+    void onRegistered(QXmppClient *client) override;
+    void onUnregistered(QXmppClient *client) override;
     /// \endcond
 
 private Q_SLOTS:

src/client/QXmppRegistrationManager.cpp

@@ -274,12 +274,11 @@ bool QXmppRegistrationManager::handleStanza(const QDomElement &stanza)
 }
 /// \endcond
 
-void QXmppRegistrationManager::setClient(QXmppClient *client)
+void QXmppRegistrationManager::onRegistered(QXmppClient *client)
 {
-    QXmppClientExtension::setClient(client);
     // get service discovery manager
     auto *disco = client->findExtension<QXmppDiscoveryManager>();
-    if (disco) {
+    if (disco != nullptr) {
         connect(disco, &QXmppDiscoveryManager::infoReceived, this, &QXmppRegistrationManager::handleDiscoInfo);
     }
 
@@ -288,6 +287,12 @@ void QXmppRegistrationManager::setClient(QXmppClient *client)
     });
 }
 
+void QXmppRegistrationManager::onUnregistered(QXmppClient *client)
+{
+    // TODO: Proper clean up of connections (currently no issue because extensions are deleted
+    // on removal)
+}
+
 void QXmppRegistrationManager::handleDiscoInfo(const QXmppDiscoveryIq &iq)
 {
     // check features of own server

src/client/QXmppRegistrationManager.h

@@ -338,7 +338,8 @@ class QXMPP_EXPORT QXmppRegistrationManager : public QXmppClientExtension
     void registrationFailed(const QXmppStanza::Error &error);
 
 protected:
-    void setClient(QXmppClient *client) override;
+    void onRegistered(QXmppClient *client) override;
+    void onUnregistered(QXmppClient *client) override;
 
 private Q_SLOTS:
     void handleDiscoInfo(const QXmppDiscoveryIq &iq);

src/client/QXmppTransferManager.cpp

@@ -944,13 +944,16 @@ bool QXmppTransferManager::handleStanza(const QDomElement &element)
     return false;
 }
 
-void QXmppTransferManager::setClient(QXmppClient *client)
+void QXmppTransferManager::onRegistered(QXmppClient *client)
 {
-    QXmppClientExtension::setClient(client);
-
     // XEP-0047: In-Band Bytestreams
     connect(client, &QXmppClient::iqReceived, this, &QXmppTransferManager::_q_iqReceived);
 }
+
+void QXmppTransferManager::onUnregistered(QXmppClient *client)
+{
+    disconnect(client, &QXmppClient::iqReceived, this, &QXmppTransferManager::_q_iqReceived);
+}
 /// \endcond
 
 void QXmppTransferManager::ibbCloseIqReceived(const QXmppIbbCloseIq &iq)

src/client/QXmppTransferManager.h

@@ -248,7 +248,8 @@ public Q_SLOTS:
 
 protected:
     /// \cond
-    void setClient(QXmppClient *client) override;
+    void onRegistered(QXmppClient *client) override;
+    void onUnregistered(QXmppClient *client) override;
     /// \endcond
 
 private Q_SLOTS:

src/client/QXmppUploadRequestManager.cpp

@@ -317,9 +317,8 @@ void QXmppUploadRequestManager::handleDiscoInfo(const QXmppDiscoveryIq &iq)
     return;
 }
 
-void QXmppUploadRequestManager::setClient(QXmppClient *client)
+void QXmppUploadRequestManager::onRegistered(QXmppClient *client)
 {
-    QXmppClientExtension::setClient(client);
     // connect to service discovery manager
     auto *disco = client->findExtension<QXmppDiscoveryManager>();
     if (disco) {
@@ -334,3 +333,9 @@ void QXmppUploadRequestManager::setClient(QXmppClient *client)
         });
     }
 }
+
+void QXmppUploadRequestManager::onUnregistered(QXmppClient *client)
+{
+    // TODO: Proper clean up of connections (currently no issue because extensions are deleted
+    // on removal)
+}