narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

support for jingle ft:5. fixes #2458

Browse source
This commit is contained in:
Daniel Gultsch 2017-04-30 16:21:13 +02:00
parent 84baa3ae68
commit 5cadc81de4
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
View file

@ -25,6 +25,7 @@ public abstract class AbstractGenerator {
"urn:xmpp:jingle:1", "urn:xmpp:jingle:1",
Content.Version.FT_3.getNamespace(), Content.Version.FT_3.getNamespace(),
Content.Version.FT_4.getNamespace(), Content.Version.FT_4.getNamespace(),
Content.Version.FT_5.getNamespace(),
"urn:xmpp:jingle:transports:s5b:1", "urn:xmpp:jingle:transports:s5b:1",
"urn:xmpp:jingle:transports:ibb:1", "urn:xmpp:jingle:transports:ibb:1",
"http://jabber.org/protocol/muc", "http://jabber.org/protocol/muc",

4
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View file

@ -302,7 +302,9 @@ public class JingleConnection implements Transferable {
ServiceDiscoveryResult result = presence != null ? presence.getServiceDiscoveryResult() : null; ServiceDiscoveryResult result = presence != null ? presence.getServiceDiscoveryResult() : null;
if (result != null) { if (result != null) {
List<String> features = result.getFeatures(); List<String> features = result.getFeatures();
if (features.contains(Content.Version.FT_4.getNamespace())) { if (features.contains(Content.Version.FT_5.getNamespace())) {
this.ftVersion = Content.Version.FT_5;
} else if (features.contains(Content.Version.FT_4.getNamespace())) {
this.ftVersion = Content.Version.FT_4; this.ftVersion = Content.Version.FT_4;
} }
} }

5
src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
View file

@ -7,7 +7,8 @@ public class Content extends Element {
public enum Version { public enum Version {
FT_3("urn:xmpp:jingle:apps:file-transfer:3"), FT_3("urn:xmpp:jingle:apps:file-transfer:3"),
FT_4("urn:xmpp:jingle:apps:file-transfer:4"); FT_4("urn:xmpp:jingle:apps:file-transfer:4"),
FT_5("urn:xmpp:jingle:apps:file-transfer:5");
private final String namespace; private final String namespace;
@ -37,6 +38,8 @@ public class Content extends Element {
return Version.FT_3; return Version.FT_3;
} else if (hasChild("description" , Version.FT_4.namespace)) { } else if (hasChild("description" , Version.FT_4.namespace)) {
return Version.FT_4; return Version.FT_4;
} else if (hasChild("description" , Version.FT_5.namespace)) {
return Version.FT_5;
} }
return null; return null;
} }