anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

OMEMO: Don't trigger "Not encrypted to this device" warning for messages w/o payload

Browse source
This commit is contained in:
fiaxh 2020-09-07 22:48:58 +02:00
parent c01d09d519
commit 3563232df0
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/omemo/src/logic/trust_manager.vala
View file

@ -304,9 +304,10 @@ public class TrustManager {
} }
} }
foreach (StanzaNode key_node in our_nodes) {
string? payload = encrypted.get_deep_string_content("payload"); string? payload = encrypted.get_deep_string_content("payload");
string? iv_node = header.get_deep_string_content("iv"); string? iv_node = header.get_deep_string_content("iv");
foreach (StanzaNode key_node in our_nodes) {
string? key_node_content = key_node.get_string_content(); string? key_node_content = key_node.get_string_content();
if (payload == null || iv_node == null || key_node_content == null) continue; if (payload == null || iv_node == null || key_node_content == null) continue;
uint8[] key; uint8[] key;
@ -413,7 +414,11 @@ public class TrustManager {
} }
} }
if (our_nodes.size == 0 && module.store.local_registration_id != sid) { if (
payload != null && // Ratchet forwarding doesn't contain payload and might not include us, which is ok
our_nodes.size == 0 && // The message was not encrypted to us
module.store.local_registration_id != sid // Message from this device. Never encrypted to itself.
) {
db.identity_meta.update_last_message_undecryptable(identity_id, sid, message.time); db.identity_meta.update_last_message_undecryptable(identity_id, sid, message.time);
trust_manager.bad_message_state_updated(conversation.account, message.from, sid); trust_manager.bad_message_state_updated(conversation.account, message.from, sid);
} }