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

Check for eme tag before adding fallback text for empty-body OMEMO messages

Browse source
This commit is contained in:
fiaxh 2019-02-20 01:44:33 +01:00
parent 73cb6eaa49
commit 78ec625dbe
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/omemo/src/trust_manager.vala
View file

@ -247,7 +247,9 @@ public class TrustManager {
StanzaNode? _encrypted = stanza.stanza.get_subnode("encrypted", NS_URI); StanzaNode? _encrypted = stanza.stanza.get_subnode("encrypted", NS_URI);
if (_encrypted == null || MessageFlag.get_flag(stanza) != null || stanza.from == null) return false; if (_encrypted == null || MessageFlag.get_flag(stanza) != null || stanza.from == null) return false;
StanzaNode encrypted = (!)_encrypted; StanzaNode encrypted = (!)_encrypted;
if (message.body == null) message.body = "[This message is OMEMO encrypted]"; if (message.body == null && Xep.ExplicitEncryption.get_encryption_tag(stanza) == NS_URI) {
message.body = "[This message is OMEMO encrypted]"; // TODO temporary
};
if (!Plugin.ensure_context()) return false; if (!Plugin.ensure_context()) return false;
MessageFlag flag = new MessageFlag(); MessageFlag flag = new MessageFlag();
stanza.add_flag(flag); stanza.add_flag(flag);

8
xmpp-vala/src/module/xep/0380_explicit_encryption.vala
View file

@ -11,4 +11,12 @@ public static void add_encryption_tag_to_message(MessageStanza message, string n
message.stanza.put_node(encryption); message.stanza.put_node(encryption);
} }
public static string? get_encryption_tag(MessageStanza message) {
StanzaNode? encryption_node = message.stanza.get_subnode("encryption", NS_URI);
if (encryption_node != null) {
return encryption_node.get_attribute("namespace", NS_URI);
}
return null;
}
} }