From 99fabf4f58d0a8dabbb8a8469fe3a81ef58b2797 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 20 Apr 2023 16:40:32 +0300
Subject: Jabber: more OMEMO fixes

---
 protocols/JabberG/src/jabber_thread.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'protocols/JabberG/src/jabber_thread.cpp')

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);
-- 
cgit v1.2.3