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

_omemo_receive_devicelist() use if/else

This commit is contained in:
Michael Vetter 2020-05-29 10:28:41 +02:00
parent b882fd495a
commit 24e8243a98

View File

@ -442,7 +442,8 @@ _omemo_receive_devicelist(xmpp_stanza_t *const stanza, void *const userdata)
} }
xmpp_stanza_t *item = xmpp_stanza_get_child_by_name(items, "item"); xmpp_stanza_t *item = xmpp_stanza_get_child_by_name(items, "item");
if (item && g_strcmp0(xmpp_stanza_get_id(item), "current") == 0 ) { if (item) {
if (g_strcmp0(xmpp_stanza_get_id(item), "current") == 0 ) {
xmpp_stanza_t *list = xmpp_stanza_get_child_by_ns(item, STANZA_NS_OMEMO); xmpp_stanza_t *list = xmpp_stanza_get_child_by_ns(item, STANZA_NS_OMEMO);
if (!list) { if (!list) {
return 1; return 1;
@ -461,10 +462,10 @@ _omemo_receive_devicelist(xmpp_stanza_t *const stanza, void *const userdata)
log_error("OMEMO: received device without ID"); log_error("OMEMO: received device without ID");
} }
} }
} } else {
if (item && g_strcmp0(xmpp_stanza_get_id(item), "current") != 0 ) {
log_warning("OMEMO: User %s has a non 'current' device item list: %s.", from, xmpp_stanza_get_id(item)); log_warning("OMEMO: User %s has a non 'current' device item list: %s.", from, xmpp_stanza_get_id(item));
} }
}
omemo_set_device_list(from, device_list); omemo_set_device_list(from, device_list);