1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Enable _handle_ox_chat() payload/body decryption

This part of the code was waiting for xmpp_stanza_new_from_string() from
libstrophe 0.10.0.
This commit is contained in:
Michael Vetter 2020-09-30 22:29:55 +02:00
parent 7f5169c2e9
commit 4d4c094b5f

View File

@ -1368,8 +1368,6 @@ _handle_ox_chat(xmpp_stanza_t* const stanza, ProfMessage* message, gboolean is_m
xmpp_stanza_t* ox = xmpp_stanza_get_child_by_name_and_ns(stanza, "openpgp", STANZA_NS_OPENPGP_0); xmpp_stanza_t* ox = xmpp_stanza_get_child_by_name_and_ns(stanza, "openpgp", STANZA_NS_OPENPGP_0);
message->plain = p_ox_gpg_decrypt(xmpp_stanza_get_text(ox)); message->plain = p_ox_gpg_decrypt(xmpp_stanza_get_text(ox));
// Implementation for libstrophe 0.10.
/*
xmpp_stanza_t *x = xmpp_stanza_new_from_string(connection_get_ctx(), message->plain); xmpp_stanza_t *x = xmpp_stanza_new_from_string(connection_get_ctx(), message->plain);
xmpp_stanza_t *p = xmpp_stanza_get_child_by_name(x, "payload"); xmpp_stanza_t *p = xmpp_stanza_get_child_by_name(x, "payload");
xmpp_stanza_t *b = xmpp_stanza_get_child_by_name(p, "body"); xmpp_stanza_t *b = xmpp_stanza_get_child_by_name(p, "body");
@ -1378,7 +1376,6 @@ _handle_ox_chat(xmpp_stanza_t* const stanza, ProfMessage* message, gboolean is_m
message->plain = xmpp_stanza_get_text(stanza); message->plain = xmpp_stanza_get_text(stanza);
} }
message->encrypted = xmpp_stanza_get_text(ox); message->encrypted = xmpp_stanza_get_text(ox);
*/
if (message->plain == NULL) { if (message->plain == NULL) {
message->plain = xmpp_stanza_get_text(stanza); message->plain = xmpp_stanza_get_text(stanza);