diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-06-04 21:45:36 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-06-04 21:45:39 +0300 |
| commit | ef8f9c7b1a42e314f41b214d14169f11d1458d44 (patch) | |
| tree | f89ea84e9ffa66e582113f1d72ec66607a51e365 /protocols/JabberG/src/jabber_thread.cpp | |
| parent | b5709b28556dbaf3b25f415cb2508c5acd797e5c (diff) | |
Jabber: more OMEMO fixes
Diffstat (limited to 'protocols/JabberG/src/jabber_thread.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 5aebee770e..6ae5341c88 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1281,11 +1281,9 @@ void CJabberProto::OnProcessMessage(const TiXmlElement *node, ThreadData *info) return;
}
- if (OmemoIsEnabled(hContact)) {
+ if (m_bUseOMEMO) {
if (auto *encNode = XmlGetChildByTag(node, "encrypted", "xmlns", JABBER_FEAT_OMEMO)) {
- if (!OmemoHandleMessage(encNode, from, msgTime, bWasSent))
- OmemoPutMessageToIncommingQueue(encNode, from, msgTime);
- debugLogA("OMEMO processing finished, returning");
+ OmemoHandleMessage(encNode, from, msgTime, bWasSent);
return; //we do not want any additional processing
}
}
|