vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add sendingThread

This commit is contained in:
vanitasvitae 2017-06-21 00:16:47 +02:00
parent 96197d4092
commit 16a7f31a46
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
7 changed files with 116 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/IncomingJingleFileOffer.java
View File

@ -51,10 +51,6 @@ public class IncomingJingleFileOffer extends JingleFileTransferSession implement
@Override
public IQ handleSessionInitiate(Jingle initiate) {
if (role == Role.initiator) {
//TODO: Is tie-break the correct way to tackle this?
return jutil.createErrorTieBreak(initiate);
}
if (getState() != State.fresh) {
//Out of order (initiate after accept)

2
smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferSession.java
View File

@ -22,6 +22,7 @@ import org.jivesoftware.smackx.jingle.JingleUtil;
import org.jivesoftware.smackx.jingle.Role;
import org.jivesoftware.smackx.jingle.element.JingleContent;
import org.jivesoftware.smackx.jingle.element.JingleContentTransport;
import org.jivesoftware.smackx.jingle.transports.JingleTransportManager;
import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransfer;
import org.jxmpp.jid.FullJid;
@ -52,6 +53,7 @@ public abstract class JingleFileTransferSession extends JingleSession {
protected String name;
protected JingleFileTransfer file;
protected JingleContentTransport transport;
protected JingleTransportManager<?> transportManager;
private final Type type;
private State state;

86
smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/OutgoingJingleFileOffer.java
View File

@ -16,18 +16,25 @@
*/
package org.jivesoftware.smackx.jingle_filetransfer;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smackx.bytestreams.BytestreamSession;
import org.jivesoftware.smackx.jingle.JingleManager;
import org.jivesoftware.smackx.jingle.JingleTransportMethodManager;
import org.jivesoftware.smackx.jingle.Role;
import org.jivesoftware.smackx.jingle.element.Jingle;
import org.jivesoftware.smackx.jingle.element.JingleContent;
import org.jivesoftware.smackx.jingle.element.JingleContentTransport;
import org.jivesoftware.smackx.jingle.transports.JingleTransportInitiationCallback;
import org.jivesoftware.smackx.jingle.transports.JingleTransportManager;
import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransfer;
@ -40,6 +47,10 @@ public class OutgoingJingleFileOffer extends JingleFileTransferSession {
private static final Logger LOGGER = Logger.getLogger(OutgoingJingleFileOffer.class.getName());
private Thread sendingThread;
private File source;
public OutgoingJingleFileOffer(XMPPConnection connection, FullJid responder, String sid) {
super(connection, connection.getUser().asFullJidOrThrow(), responder, Role.initiator, sid, Type.offer);
}
@ -50,14 +61,14 @@ public class OutgoingJingleFileOffer extends JingleFileTransferSession {
public void sendFile(JingleFileTransfer file, JingleContent.Creator creator, String name) throws InterruptedException, XMPPException.XMPPErrorException, SmackException.NotConnectedException, SmackException.NoResponseException {
if (getState() == State.fresh) {
JingleTransportManager<?> transportManager = JingleTransportMethodManager.getInstanceFor(connection)
transportManager = JingleTransportMethodManager.getInstanceFor(connection)
.getBestAvailableTransportManager();
if (transportManager == null) {
throw new IllegalStateException("There must be at least one workable transport method.");
}
JingleContentTransport transport = transportManager.createTransport();
transport = transportManager.createTransport();
jutil.sendSessionInitiateFileOffer(getResponder(), getSessionId(), creator, name, file, transport);
}
@ -65,14 +76,26 @@ public class OutgoingJingleFileOffer extends JingleFileTransferSession {
@Override
public IQ handleSessionAccept(Jingle sessionAccept) {
//TODO
setState(State.active);
transportManager.initiateOutgoingSession(transport, new JingleTransportInitiationCallback() {
@Override
public void onSessionInitiated(final BytestreamSession session) {
sendingThread = new SendingThread(session, source);
sendingThread.run();
}
});
return jutil.createAck(sessionAccept);
}
@Override
public IQ handleSessionTerminate(Jingle sessionTerminate) {
//TODO
if (sendingThread != null && !sendingThread.isInterrupted()) {
sendingThread.interrupt();
}
setState(State.terminated);
return jutil.createAck(sessionTerminate);
}
@ -89,5 +112,58 @@ public class OutgoingJingleFileOffer extends JingleFileTransferSession {
transportReplace.getInitiator(), transportReplace.getSid(), creator, name,
replacementManager.createTransport());
}
return jutil.createAck(transportReplace);
}
private static class SendingThread extends Thread {
private final BytestreamSession session;
private final File source;
public SendingThread(BytestreamSession session, File source) {
this.session = session;
this.source = source;
}
@Override
public void run() {
InputStream inputStream;
OutputStream outputStream;
try {
inputStream = new FileInputStream(source);
outputStream = session.getOutputStream();
byte[] filebuf = new byte[(int) source.length()];
int r = inputStream.read(filebuf);
if (r < 0) {
throw new IOException("Read returned -1");
}
outputStream.write(filebuf);
}
catch (IOException e) {
LOGGER.log(Level.SEVERE, "Could not send file: " + e, e);
}
finally {
try {
session.close();
} catch (IOException e) {
LOGGER.log(Level.SEVERE, "Could not close session.", e);
}
}
}
@Override
public void interrupt() {
try {
session.close();
} catch (IOException e) {
LOGGER.log(Level.SEVERE, "Could not close session.", e);
}
super.interrupt();
}
}
}

10
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java
View File

@ -121,7 +121,11 @@ public abstract class JingleSession implements JingleSessionHandler {
case session_terminate:
return handleSessionTerminate(jingle);
case transport_replace:
return handleTransportReplace(jingle);
try {
return handleTransportReplace(jingle);
} catch (InterruptedException | SmackException.NoResponseException | SmackException.NotConnectedException | XMPPException.XMPPErrorException e) {
e.printStackTrace();
}
default:
return IQ.createResultIQ(jingle);
}
@ -179,7 +183,9 @@ public abstract class JingleSession implements JingleSessionHandler {
return IQ.createResultIQ(transportInfo);
}
protected IQ handleTransportReplace(Jingle transportReplace) throws InterruptedException, XMPPException.XMPPErrorException, SmackException.NotConnectedException, SmackException.NoResponseException {
protected IQ handleTransportReplace(Jingle transportReplace)
throws InterruptedException, XMPPException.XMPPErrorException,
SmackException.NotConnectedException, SmackException.NoResponseException {
return IQ.createResultIQ(transportReplace);
}

13
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/JingleTransportInitiationCallback.java Normal file
View File

@ -0,0 +1,13 @@
package org.jivesoftware.smackx.jingle.transports;
import org.jivesoftware.smackx.bytestreams.BytestreamSession;
/**
* Created by vanitas on 20.06.17.
*/
public interface JingleTransportInitiationCallback {
void onSessionInitiated(BytestreamSession bytestreamSession);
}

4
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/JingleTransportManager.java
View File

@ -31,4 +31,8 @@ public abstract class JingleTransportManager<D extends JingleContentTransport> {
public abstract D createTransport(Jingle request);
public abstract void initiateOutgoingSession(JingleContentTransport transport, JingleTransportInitiationCallback callback);
public abstract void initiateIncomingSession(JingleContentTransport transport, JingleTransportInitiationCallback callback);
}

8
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/JingleTransportNegotiator.java Normal file
View File

@ -0,0 +1,8 @@
package org.jivesoftware.smackx.jingle.transports;
/**
* Created by vanitas on 20.06.17.
*/
public interface JingleTransportNegotiator {
}