From d7cf19aca74ca628752c3bf9e1a97263c9a135de Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@fsfe.org>
Date: Sun, 25 Jun 2017 16:39:02 +0200
Subject: [PATCH] Add createCandidateUsed

---
 .../jingle_s5b/JingleS5BTransportManager.java | 24 +++++++++++++++--
 .../jingle_s5b/JingleS5BTransportSession.java | 27 +++++++++----------
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportManager.java
index c6311f2db..a3ef80652 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportManager.java
@@ -177,7 +177,9 @@ public final class JingleS5BTransportManager extends JingleTransportManager<Jing
         return jingle;
     }
 
-    public Jingle createProxyError(FullJid remote, FullJid initiator, String sessionId, JingleContent.Senders senders, JingleContent.Creator creator, String name, String streamId) {
+    public Jingle createProxyError(FullJid remote, FullJid initiator, String sessionId,
+                                   JingleContent.Senders senders, JingleContent.Creator creator,
+                                   String name, String streamId) {
         Jingle.Builder jb = Jingle.getBuilder();
         jb.setSessionId(sessionId).setAction(JingleAction.transport_info).setInitiator(initiator);
 
@@ -185,7 +187,7 @@ public final class JingleS5BTransportManager extends JingleTransportManager<Jing
         cb.setSenders(senders).setCreator(creator).setName(name);
 
         JingleS5BTransport.Builder tb = JingleS5BTransport.getBuilder();
-        tb.setStreamId(sessionId).setProxyError();
+        tb.setStreamId(sessionId).setProxyError().setStreamId(streamId);
 
         Jingle jingle = jb.addJingleContent(cb.setTransport(tb.build()).build()).build();
         jingle.setTo(remote);
@@ -193,4 +195,22 @@ public final class JingleS5BTransportManager extends JingleTransportManager<Jing
         return jingle;
     }
 
+    public Jingle createCandidateActivated(FullJid remote, FullJid initiator, String sessionId,
+                                           JingleContent.Senders senders, JingleContent.Creator creator,
+                                           String name, String streamId, String candidateId) {
+        Jingle.Builder jb = Jingle.getBuilder();
+        jb.setInitiator(initiator).setSessionId(sessionId).setAction(JingleAction.transport_info);
+
+        JingleContent.Builder cb = JingleContent.getBuilder();
+        cb.setName(name).setCreator(creator).setSenders(senders);
+
+        JingleS5BTransport.Builder tb = JingleS5BTransport.getBuilder();
+        tb.setStreamId(streamId).setCandidateActivated(candidateId);
+
+        Jingle jingle = jb.addJingleContent(cb.setTransport(tb.build()).build()).build();
+        jingle.setFrom(getConnection().getUser().asFullJidOrThrow());
+        jingle.setTo(remote);
+        return jingle;
+    }
+
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java
index 1ae03607a..da051a7d3 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java
@@ -239,11 +239,13 @@ public class JingleS5BTransportSession extends JingleTransportSession<JingleS5BT
         return IQ.createResultIQ(candidateUsed);
     }
 
-    private void connect(JingleS5BTransportCandidate candidate) {
+    private void connect(JingleS5BTransportCandidate candidate) throws SmackException.NotConnectedException, InterruptedException {
         JingleSession jSession = jingleSession.get();
         if (jSession == null) {
             throw new NullPointerException("Lost reference to JingleSession.");
         }
+        JingleContent content = jSession.getContents().get(0);
+
         // Used candidate belongs to remote.
         if (candidate == localUsedCandidate) {
 
@@ -286,20 +288,17 @@ public class JingleS5BTransportSession extends JingleTransportSession<JingleS5BT
                             SmackException.NotConnectedException | InterruptedException e) {
                         LOGGER.log(Level.SEVERE, "Could not activate proxy server: " + e, e);
 
-                        JingleContent content = jSession.getContents().get(0);
-                        try {
-                            //send proxy error
-                            jSession.getConnection().sendStanza(transportManager.createProxyError(
-                                    jSession.getRemote(), jSession.getInitiator(), jSession.getSessionId(),
-                                    content.getSenders(), content.getCreator(), content.getName(),
-                                    ((JingleS5BTransport) localTransport).getStreamId()));
-                        } catch (SmackException.NotConnectedException | InterruptedException e1) {
-                            LOGGER.log(Level.SEVERE, "Could not send proxy error.", e);
-                            return;
-                        }
+                        //send proxy error
+                        jSession.getConnection().sendStanza(transportManager.createProxyError(
+                                jSession.getRemote(), jSession.getInitiator(), jSession.getSessionId(),
+                                content.getSenders(), content.getCreator(), content.getName(),
+                                ((JingleS5BTransport) localTransport).getStreamId()));
+                        return;
                     }
-                    //send candidate-activate
-                    
+
+                    transportManager.createCandidateActivated(jSession.getRemote(), jSession.getInitiator(), jSession.getSessionId(),
+                            content.getSenders(), content.getCreator(), content.getName(), ((JingleS5BTransport) localTransport).getStreamId(),
+                            candidate.getCandidateId());
                 }
 
             } else {