diff options
| author | George Hazan <ghazan@miranda.im> | 2023-04-20 16:40:32 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2023-04-20 16:40:32 +0300 |
| commit | 99fabf4f58d0a8dabbb8a8469fe3a81ef58b2797 (patch) | |
| tree | 8583b0575efae194338879f333bb3c8dc6a0066e /protocols/JabberG/src/jabber_thread.cpp | |
| parent | d024fb380fff7333f297ce72a9ecd45e8634f4b6 (diff) | |
Jabber: more OMEMO fixes
Diffstat (limited to 'protocols/JabberG/src/jabber_thread.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 5ee69b908e..0f7816134c 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -947,7 +947,7 @@ void CJabberProto::OnProcessPubsubEvent(const TiXmlElement *node) if (!hContact)
return;
- if (m_bUseOMEMO) {
+ if (OmemoIsEnabled(hContact)) {
auto *itemsNode = XmlGetChildByTag(eventNode, "items", "node", JABBER_FEAT_OMEMO ".devicelist");
if (itemsNode) {
OmemoHandleDeviceList(from, itemsNode);
@@ -1278,7 +1278,7 @@ void CJabberProto::OnProcessMessage(const TiXmlElement *node, ThreadData *info) return;
}
- if (m_bUseOMEMO && OmemoIsEnabled(hContact)) {
+ if (OmemoIsEnabled(hContact)) {
if (auto *encNode = XmlGetChildByTag(node, "encrypted", "xmlns", JABBER_FEAT_OMEMO)) {
if (!OmemoHandleMessage(encNode, from, msgTime))
OmemoPutMessageToIncommingQueue(encNode, from, msgTime);
|