diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/omemo/QXmppOmemoManager.cpp | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/src/omemo/QXmppOmemoManager.cpp b/src/omemo/QXmppOmemoManager.cpp index 8b1e532b..938df22a 100644 --- a/src/omemo/QXmppOmemoManager.cpp +++ b/src/omemo/QXmppOmemoManager.cpp @@ -249,14 +249,12 @@ void QXmppOmemoDevice::setTrustLevel(TrustLevel trustLevel) /// /// A trust manager using its storage must be added to the client: /// \code -/// QXmppTrustManager *trustManager = new QXmppAtmManager(trustStorage); -/// client->addExtension(trustManager); +/// client->addNewExtension<QXmppAtmManager>(trustStorage); /// \endcode /// /// Afterwards, the OMEMO manager using its storage must be added to the client: /// \code -/// QXmppOmemoManager *manager = new QXmppOmemoManager(omemoStorage); -/// client->addExtension(manager); +/// auto *manager = client->addNewExtension<QXmppOmemoManager>(omemoStorage); /// \endcode /// /// You can set a security policy used by OMEMO. @@ -268,17 +266,11 @@ void QXmppOmemoDevice::setTrustLevel(TrustLevel trustLevel) /// /// \xep{0280, Message Carbons} should be used for delivering messages to all endpoints of a user: /// \code -/// QXmppCarbonManager *carbonManager = new QXmppCarbonManager; -/// client->addExtension(carbonManager); -/// connect(client, &QXmppClient::connected, this, [=]() { -/// carbonManager->setCarbonsEnabled(true); -/// }); -/// connect(carbonManager, &QXmppCarbonManager::messageSent, manager, -/// &QXmppOmemoManager::handleMessage); -/// connect(carbonManager, &QXmppCarbonManager::messageReceived, manager, -/// &QXmppOmemoManager::handleMessage); +/// client->addNewExtension<QXmppCarbonManagerV2>(); /// \endcode /// +/// The old QXmppCarbonManager cannot be used with OMEMO. +/// /// The OMEMO data must be loaded before connecting to the server: /// \code /// manager->load(); @@ -940,8 +932,6 @@ QFuture<bool> Manager::resetAll() } /// -/// \fn QXmppOmemoManager::setSecurityPolicy(QXmpp::TrustSecurityPolicy securityPolicy) -/// /// Sets the security policy used by this E2EE extension. /// /// \param securityPolicy security policy being set @@ -952,8 +942,6 @@ QFuture<void> Manager::setSecurityPolicy(QXmpp::TrustSecurityPolicy securityPoli } /// -/// \fn QXmppOmemoManager::securityPolicy() -/// /// Returns the security policy used by this E2EE extension. /// /// \return the used security policy @@ -964,8 +952,6 @@ QFuture<QXmpp::TrustSecurityPolicy> Manager::securityPolicy() } /// -/// \fn QXmppOmemoManager::setTrustLevel(const QMultiHash<QString, QByteArray> &keyIds, QXmpp::TrustLevel trustLevel) -/// /// Sets the trust level of keys. /// /// If a key is not stored, it is added to the storage. @@ -979,8 +965,6 @@ QFuture<void> Manager::setTrustLevel(const QMultiHash<QString, QByteArray> &keyI } /// -/// \fn QXmppOmemoManager::trustLevel(const QString &keyOwnerJid, const QByteArray &keyId) -/// /// Returns the trust level of a key. /// /// If the key is not stored, the trust in that key is undecided. |