From fff5ae880309d49b151d382f1efe2e93f4e251e6 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Tue, 9 May 2017 20:51:40 +0200
Subject: support for jingle ft:5

---
 src/main/java/de/pixart/messenger/generator/AbstractGenerator.java  | 1 +
 src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java | 4 +++-
 src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java  | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/de/pixart/messenger/generator/AbstractGenerator.java b/src/main/java/de/pixart/messenger/generator/AbstractGenerator.java
index d3ea5fa9e..a87a37885 100644
--- a/src/main/java/de/pixart/messenger/generator/AbstractGenerator.java
+++ b/src/main/java/de/pixart/messenger/generator/AbstractGenerator.java
@@ -25,6 +25,7 @@ public abstract class AbstractGenerator {
             "urn:xmpp:jingle:1",
             Content.Version.FT_3.getNamespace(),
             Content.Version.FT_4.getNamespace(),
+            Content.Version.FT_5.getNamespace(),
             "urn:xmpp:jingle:transports:s5b:1",
             "urn:xmpp:jingle:transports:ibb:1",
             "http://jabber.org/protocol/muc",
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
index ff97732a3..1ca924834 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
@@ -305,7 +305,9 @@ public class JingleConnection implements Transferable {
             ServiceDiscoveryResult result = presence != null ? presence.getServiceDiscoveryResult() : null;
             if (result != null) {
                 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;
                 }
             }
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java
index fc7231e30..d4220083e 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java
@@ -7,7 +7,8 @@ public class Content extends Element {
 
     public enum Version {
         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;
 
@@ -37,6 +38,8 @@ public class Content extends Element {
             return Version.FT_3;
         } else if (hasChild("description", Version.FT_4.namespace)) {
             return Version.FT_4;
+        } else if (hasChild("description", Version.FT_5.namespace)) {
+            return Version.FT_5;
         }
         return null;
     }
-- 
cgit v1.2.3