From dbc6d87cb9c26a5858ccf7400a43cdd4f6f26971 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 10 Feb 2022 15:41:24 +0100 Subject: Various call fixes - Don't create incoming CIM calls twice - Fix is_color check for video devices w/ multiple formats - Tolerate mismatching content creator on jingle responses - Change MUJI namespace to urn:xmpp:jingle:muji:0 --- xmpp-vala/src/module/xep/0166_jingle/session.vala | 8 ++------ xmpp-vala/src/module/xep/0272_muji.vala | 2 +- xmpp-vala/src/module/xep/0353_jingle_message_initiation.vala | 2 ++ 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'xmpp-vala') diff --git a/xmpp-vala/src/module/xep/0166_jingle/session.vala b/xmpp-vala/src/module/xep/0166_jingle/session.vala index af913aab..e5084880 100644 --- a/xmpp-vala/src/module/xep/0166_jingle/session.vala +++ b/xmpp-vala/src/module/xep/0166_jingle/session.vala @@ -105,9 +105,7 @@ public class Xmpp.Xep.Jingle.Session : Object { Content content = contents_map[content_node.name]; - if (content_node.creator != content.content_creator) { - throw new IqError.BAD_REQUEST("unknown content; creator"); - } + if (content_node.creator != content.content_creator) warning("Received transport-* with unexpected content creator from %s", peer_full_jid.to_string()); switch (action) { case "transport-accept": @@ -135,9 +133,7 @@ public class Xmpp.Xep.Jingle.Session : Object { Content content = contents_map[content_node.name]; - if (content_node.creator != content.content_creator) { - throw new IqError.BAD_REQUEST("unknown content; creator"); - } + if (content_node.creator != content.content_creator) warning("Received description-info with unexpected content creator from %s", peer_full_jid.to_string()); content.on_description_info(stream, content_node.description, jingle, iq); } else if (action == "security-info") { diff --git a/xmpp-vala/src/module/xep/0272_muji.vala b/xmpp-vala/src/module/xep/0272_muji.vala index f8b45e25..b1dd7f40 100644 --- a/xmpp-vala/src/module/xep/0272_muji.vala +++ b/xmpp-vala/src/module/xep/0272_muji.vala @@ -1,7 +1,7 @@ using Gee; namespace Xmpp.Xep.Muji { - public const string NS_URI = "http://telepathy.freedesktop.org/muji"; + public const string NS_URI = "urn:xmpp:jingle:muji:0"; public class Module : XmppStreamModule { public static ModuleIdentity IDENTITY = new ModuleIdentity(NS_URI, "0272_muji"); diff --git a/xmpp-vala/src/module/xep/0353_jingle_message_initiation.vala b/xmpp-vala/src/module/xep/0353_jingle_message_initiation.vala index ac1d8329..730f07e8 100644 --- a/xmpp-vala/src/module/xep/0353_jingle_message_initiation.vala +++ b/xmpp-vala/src/module/xep/0353_jingle_message_initiation.vala @@ -51,6 +51,8 @@ namespace Xmpp.Xep.JingleMessageInitiation { } private void on_received_message(XmppStream stream, MessageStanza message) { + if (message.type_ == MessageStanza.TYPE_GROUPCHAT) return; + Xep.MessageArchiveManagement.MessageFlag? mam_flag = Xep.MessageArchiveManagement.MessageFlag.get_flag(message); if (mam_flag != null) return; -- cgit v1.2.3-54-g00ecf