vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-10 17:49:38 +02:00
Code Issues Releases Wiki Activity

JingleIBBTransportTest works

Browse source
This commit is contained in:
vanitasvitae 2017-07-27 22:23:10 +02:00
parent 68a03aeb48
commit 60cb777ea9
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
6 changed files with 140 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleContent.java
View file

@ -266,9 +266,9 @@ public class JingleContent implements JingleTransportCallback {
throws SmackException.NotConnectedException, InterruptedException {
//Establish transport
if (isReceiving()) {
getTransport().establishIncomingBytestreamSession(connection, this);
getTransport().establishIncomingBytestreamSession(connection, this, getParent());
} else if (isSending()) {
getTransport().establishOutgoingBytestreamSession(connection, this);
getTransport().establishOutgoingBytestreamSession(connection, this, getParent());
}
}

4
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleTransport.java
View file

@ -76,10 +76,10 @@ public abstract class JingleTransport<D extends JingleContentTransportElement> e
public abstract String getNamespace();
public abstract void establishIncomingBytestreamSession(XMPPConnection connection, JingleTransportCallback callback)
public abstract void establishIncomingBytestreamSession(XMPPConnection connection, JingleTransportCallback callback, JingleSession session)
throws SmackException.NotConnectedException, InterruptedException;
public abstract void establishOutgoingBytestreamSession(XMPPConnection connection, JingleTransportCallback callback)
public abstract void establishOutgoingBytestreamSession(XMPPConnection connection, JingleTransportCallback callback, JingleSession session)
throws SmackException.NotConnectedException, InterruptedException;
public void setPeersProposal(JingleTransport<?> peersProposal) {

7
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransport.java
View file

@ -72,9 +72,7 @@ public class JingleIBBTransport extends JingleTransport<JingleIBBTransportElemen
}
@Override
public void establishIncomingBytestreamSession(final XMPPConnection connection, final JingleTransportCallback callback) {
final JingleSession session = getParent().getParent();
public void establishIncomingBytestreamSession(final XMPPConnection connection, final JingleTransportCallback callback, final JingleSession session) {
final InBandBytestreamManager inBandBytestreamManager = InBandBytestreamManager.getByteStreamManager(connection);
InBandBytestreamListener bytestreamListener = new InBandBytestreamListener() {
@ -104,8 +102,7 @@ public class JingleIBBTransport extends JingleTransport<JingleIBBTransportElemen
}
@Override
public void establishOutgoingBytestreamSession(XMPPConnection connection, JingleTransportCallback callback) {
JingleSession session = getParent().getParent();
public void establishOutgoingBytestreamSession(XMPPConnection connection, JingleTransportCallback callback, final JingleSession session) {
InBandBytestreamManager inBandBytestreamManager = InBandBytestreamManager.getByteStreamManager(connection);
inBandBytestreamManager.setDefaultBlockSize(blockSize);
try {

4
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java
View file

@ -128,14 +128,14 @@ public class JingleS5BTransport extends JingleTransport<JingleS5BTransportElemen
}
@Override
public void establishIncomingBytestreamSession(XMPPConnection connection, JingleTransportCallback callback)
public void establishIncomingBytestreamSession(XMPPConnection connection, JingleTransportCallback callback, JingleSession session)
throws SmackException.NotConnectedException, InterruptedException {
this.callback = callback;
establishBytestreamSession(connection);
}
@Override
public void establishOutgoingBytestreamSession(XMPPConnection connection, JingleTransportCallback callback)
public void establishOutgoingBytestreamSession(XMPPConnection connection, JingleTransportCallback callback, JingleSession session)
throws SmackException.NotConnectedException, InterruptedException {
this.callback = callback;
establishBytestreamSession(connection);