aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMelvin Keskin <melvo@olomono.de>2023-04-05 19:48:24 +0200
committerLinus Jahn <lnj@kaidan.im>2023-04-07 16:01:23 +0200
commit40680cdc07a0afc5ca2a3fcf1da466d0a909f5c1 (patch)
treecc7d61dfceb35f1bcf338e3417551f80db80e6de
parent7cdc35101d6aa7fb777555001c501a012c94df92 (diff)
OmemoManager: Fix emitting 'deviceChanged()'
-rw-r--r--src/omemo/QXmppOmemoManager.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/omemo/QXmppOmemoManager.cpp b/src/omemo/QXmppOmemoManager.cpp
index d555cb88..43ac3f1b 100644
--- a/src/omemo/QXmppOmemoManager.cpp
+++ b/src/omemo/QXmppOmemoManager.cpp
@@ -1243,6 +1243,7 @@ void Manager::setClient(QXmppClient *client)
connect(d->trustManager, &QXmppTrustManager::trustLevelsChanged, this, [=](const QHash<QString, QMultiHash<QString, QByteArray>> &modifiedKeys) {
const auto &modifiedOmemoKeys = modifiedKeys.value(ns_omemo_2);
+
if (!modifiedOmemoKeys.isEmpty()) {
Q_EMIT trustLevelsChanged(modifiedOmemoKeys);
}
@@ -1253,9 +1254,9 @@ void Manager::setClient(QXmppClient *client)
// Emit 'deviceChanged()' only if there is a device with the key.
const auto &devices = d->devices.value(keyOwnerJid);
- for (auto itr = devices.cbegin(); itr != devices.cend(); ++itr) {
- if (itr->keyId == keyId) {
- Q_EMIT deviceChanged(keyOwnerJid, itr.key());
+ for (auto devicesItr = devices.cbegin(); devicesItr != devices.cend(); ++devicesItr) {
+ if (devicesItr->keyId == keyId) {
+ Q_EMIT deviceChanged(keyOwnerJid, devicesItr.key());
return;
}
}