[network/kaidan] /: Require QXmpp 1.17

Git commit 274420776769dab5f20ffcea8eb8e8d89bbef58d by Melvin Keskin.
Committed on 22/07/2026 at 23:06.
Pushed by melvo into branch 'master'.

Require QXmpp 1.17

The commit 09037dea7ccbe62395601fa703ee56aa3cb35e46 needs QXmpp 1.17.
Any backward compatibility is dropped.

M  +1    -1    CMakeLists.txt
M  +1    -1    README.md
M  +0    -17   src/Account.cpp
M  +0    -10   src/Account.h
M  +0    -3    src/ClientController.cpp

https://invent.kde.org/network/kaidan/-/commit/274420776769dab5f20ffcea8eb8e8d89bbef58d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4147282a9..cea34a4d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,7 @@ if (NOT ANDROID)
 endif()
 
 find_package(KF6KirigamiAddons 1.8.0 REQUIRED)
-find_package(QXmppQt6 1.16.0 REQUIRED COMPONENTS Omemo)
+find_package(QXmppQt6 1.17.0 REQUIRED COMPONENTS Omemo)
 
 find_package(ICU 61.0 COMPONENTS uc)
 set_package_properties(ICU PROPERTIES
diff --git a/README.md b/README.md
index bd9220cb9..4bf90cf7d 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ The following dependencies are needed by Kaidan:
 * [Kirigami Addons][kirigami-addons] >= 1.8.0
 * [Qt][qt-build-sources] >= 6.9.0 - Concurrent | Core | Multimedia | Location | Positioning | Qml | Qt6GuiPrivate (since Qt 6.10.0) | Quick | QuickControls2 | Sql | Svg | Xml
 * [QtKeychain][qtkeychain] >= 0.15
-* [QXmpp][qxmpp] (with OMEMO, GStreamer) >= 1.16.0
+* [QXmpp][qxmpp] (with OMEMO, GStreamer) >= 1.17.0
 
 ### Optional Dependencies
 
diff --git a/src/Account.cpp b/src/Account.cpp
index d77552f78..cde35c0fe 100644
--- a/src/Account.cpp
+++ b/src/Account.cpp
@@ -43,9 +43,6 @@ AccountSettings::AccountSettings(Data data, QObject *parent)
     : QObject(parent)
     , m_data(data)
 {
-#if QXMPP_VERSION < QT_VERSION_CHECK(1, 17, 0)
-    generateJidResource();
-#endif
     generateUserAgentDeviceId();
 }
 
@@ -72,13 +69,6 @@ void AccountSettings::setJid(const QString &jid)
     }
 }
 
-#if QXMPP_VERSION < QT_VERSION_CHECK(1, 17, 0)
-QString AccountSettings::jidResource() const
-{
-    return m_data.jidResource;
-}
-#endif
-
 QString AccountSettings::password() const
 {
     return m_data.password;
@@ -394,13 +384,6 @@ QString AccountSettings::loginUriString() const
     return uri.toString();
 }
 
-#if QXMPP_VERSION < QT_VERSION_CHECK(1, 17, 0)
-void AccountSettings::generateJidResource()
-{
-    m_data.jidResource = QXmppUtils::generateStanzaHash(4);
-}
-#endif
-
 void AccountSettings::generateUserAgentDeviceId()
 {
     if (auto &deviceId = m_data.userAgentDeviceId; deviceId.isNull()) {
diff --git a/src/Account.h b/src/Account.h
index a1f96a4ef..e2d74fcdc 100644
--- a/src/Account.h
+++ b/src/Account.h
@@ -129,9 +129,6 @@ public:
         bool initialized = false;
         bool initialMessagesRetrieved = false;
         QString jid;
-#if QXMPP_VERSION < QT_VERSION_CHECK(1, 17, 0)
-        QString jidResource;
-#endif
         QString password;
         QXmppCredentials credentials;
         QUuid userAgentDeviceId;
@@ -169,10 +166,6 @@ public:
     void setJid(const QString &jid);
     Q_SIGNAL void jidChanged();
 
-#if QXMPP_VERSION < QT_VERSION_CHECK(1, 17, 0)
-    QString jidResource() const;
-#endif
-
     QString password() const;
     void setPassword(const QString &password);
     Q_SIGNAL void passwordChanged();
@@ -263,9 +256,6 @@ public:
     QString loginUriString() const;
 
 private:
-#if QXMPP_VERSION < QT_VERSION_CHECK(1, 17, 0)
-    void generateJidResource();
-#endif
     void generateUserAgentDeviceId();
 
     Data m_data;
diff --git a/src/ClientController.cpp b/src/ClientController.cpp
index 86e778773..72ea5344e 100644
--- a/src/ClientController.cpp
+++ b/src/ClientController.cpp
@@ -133,9 +133,6 @@ void ClientController::logIn()
 
     m_encryptionController->load().then([this] {
         QXmppConfiguration config;
-#if QXMPP_VERSION < QT_VERSION_CHECK(1, 17, 0)
-        config.setResource(m_accountSettings->jidResource());
-#endif
         config.setCredentials(m_accountSettings->credentials());
         config.setPassword(m_accountSettings->password());
         config.setSasl2UserAgent(m_accountSettings->userAgent());