diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-06-29 17:16:34 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-30 16:53:43 +0200 |
| commit | 845bb3f7363893cd8539dbbcbb75c2215ea9b3ea (patch) | |
| tree | f36dc58c01cca83af1c9393bbc3009df3c8bebf6 /src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java | |
| parent | 01eb94ef997c22f9de46894d06be8ee8a87beb66 (diff) | |
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)
Diffstat (limited to 'src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java | 4 |
1 files changed, 3 insertions, 1 deletions
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", |