From 845bb3f7363893cd8539dbbcbb75c2215ea9b3ea Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 29 Jun 2016 17:16:34 +0200 Subject: support jingle ft:4 to be compatible with swift Conversations and Gajim both have an implementation bug that sends the jingle session id instead of the transport id (compare XEP-260 2.2). This commit has a work around for this that remains buggy when using ft:3. If gajim is ever to fix this we will be incompatbile. gajim should implement ft:4 instead. (gajim to gajim is broken as well) --- src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java') diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java index 765e91f29..bdf26b082 100644 --- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java @@ -16,11 +16,13 @@ import eu.siacs.conversations.Config; import eu.siacs.conversations.crypto.axolotl.AxolotlService; import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.utils.PhoneHelper; +import eu.siacs.conversations.xmpp.jingle.stanzas.Content; public abstract class AbstractGenerator { private final String[] FEATURES = { "urn:xmpp:jingle:1", - "urn:xmpp:jingle:apps:file-transfer:3", + Content.Version.FT_3.getNamespace(), + Content.Version.FT_4.getNamespace(), "urn:xmpp:jingle:transports:s5b:1", "urn:xmpp:jingle:transports:ibb:1", "http://jabber.org/protocol/muc", -- cgit v1.2.3