From 40680cdc07a0afc5ca2a3fcf1da466d0a909f5c1 Mon Sep 17 00:00:00 2001 From: Melvin Keskin Date: Wed, 5 Apr 2023 19:48:24 +0200 Subject: OmemoManager: Fix emitting 'deviceChanged()' --- src/omemo/QXmppOmemoManager.cpp | 7 ++++--- 1 file 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> &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; } } -- cgit v1.2.3