vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-14 11:39:39 +02:00
Code Issues Releases Wiki Activity

Temp

Browse source
This commit is contained in:
vanitasvitae 2017-06-10 21:45:00 +02:00
parent a4454aa8b5
commit 4d11422335
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
9 changed files with 84 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
View file

@ -69,7 +69,7 @@ public final class JingleManager extends Manager {
Jid from = jingle.getFrom();
assert (from != null);
FullJid fullFrom = from.asFullJidOrThrow();
FullJidAndSessionId fullJidAndSessionId = new FullJidAndSessionId(fullFrom, jingle.getSid());
FullJidAndSessionId fullJidAndSessionId = new FullJidAndSessionId(fullFrom, jingle.getSessionId());
JingleSessionHandler jingleSessionHandler = jingleSessionHandlers.get(fullJidAndSessionId);
if (jingleSessionHandler == null) {
@ -79,7 +79,7 @@ public final class JingleManager extends Manager {
.addExtension(JingleError.UNKNOWN_SESSION);
return IQ.createErrorResponse(jingle, errorBuilder);
}
return jingleSessionHandler.handleJingleSessionRequest(jingle, jingle.getSid());
return jingleSessionHandler.handleJingleSessionRequest(jingle, jingle.getSessionId());
}
if (jingle.getContents().size() > 1) {
@ -95,7 +95,7 @@ public final class JingleManager extends Manager {
//Unsupported Application
Jingle.Builder builder = Jingle.getBuilder();
builder.setAction(JingleAction.session_terminate)
.setSessionId(jingle.getSid())
.setSessionId(jingle.getSessionId())
.setReason(JingleReason.Reason.unsupported_applications);
Jingle response = builder.build();
response.setTo(jingle.getFrom());

5
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleTransportHandler.java
View file

@ -1,6 +1,7 @@
package org.jivesoftware.smackx.jingle;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smackx.jingle.element.Jingle;
import org.jivesoftware.smackx.jingle.element.JingleContentTransport;
/**
@ -8,9 +9,9 @@ import org.jivesoftware.smackx.jingle.element.JingleContentTransport;
*/
public interface JingleTransportHandler<D extends JingleContentTransport> {
void establishOutgoingSession(JingleManager.FullJidAndSessionId target, JingleContentTransport transport, JingleTransportEstablishedCallback callback);
void establishOutgoingSession(Jingle request, JingleTransportEstablishedCallback callback);
void establishIncomingSession(JingleManager.FullJidAndSessionId target, JingleContentTransport transport, JingleTransportEstablishedCallback callback);
void establishIncomingSession(Jingle request, JingleTransportEstablishedCallback callback);
XMPPConnection getConnection();
}

4
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/Jingle.java
View file

@ -108,7 +108,7 @@ public final class Jingle extends IQ {
*
* @return Returns the session ID related to the session.
*/
public String getSid() {
public String getSessionId() {
return sessionId;
}
@ -135,7 +135,7 @@ public final class Jingle extends IQ {
xml.optAttribute(INITIATOR_ATTRIBUTE_NAME, getInitiator());
xml.optAttribute(RESPONDER_ATTRIBUTE_NAME, getResponder());
xml.optAttribute(ACTION_ATTRIBUTE_NAME, getAction());
xml.optAttribute(SESSION_ID_ATTRIBUTE_NAME, getSid());
xml.optAttribute(SESSION_ID_ATTRIBUTE_NAME, getSessionId());
xml.rightAngleBracket();
xml.optElement(reason);

2
smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleTest.java
View file

@ -66,7 +66,7 @@ public class JingleTest extends SmackTestSuite {
assertEquals(romeo, jingle.getInitiator());
assertEquals(juliet, jingle.getResponder());
assertEquals(jingle.getAction(), JingleAction.session_initiate);
assertEquals(sessionId, jingle.getSid());
assertEquals(sessionId, jingle.getSessionId());
String xml = "<jingle xmlns='urn:xmpp:jingle:1' " +
"initiator='romeo@montague.lit/orchard' " +