diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/IncomingJingleFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/IncomingJingleFileOffer.java index dd16214a5..c694b360f 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/IncomingJingleFileOffer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/IncomingJingleFileOffer.java @@ -143,6 +143,15 @@ public class IncomingJingleFileOffer extends JingleFileTransferSession implement state = State.active; + try { + jutil.sendSessionAccept(getInitiator(), sid, getContents().get(0).getCreator(), + getContents().get(0).getName(), JingleContent.Senders.initiator, file, + transportSession.createTransport()); + } catch (SmackException.NotConnectedException | SmackException.NoResponseException | + XMPPException.XMPPErrorException | InterruptedException e) { + LOGGER.log(Level.WARNING, "Could not send session-accept.", e); + } + transportSession.initiateIncomingSession(new JingleTransportInitiationCallback() { @Override public void onSessionInitiated(BytestreamSession bytestreamSession) { @@ -153,18 +162,9 @@ public class IncomingJingleFileOffer extends JingleFileTransferSession implement @Override public void onException(Exception e) { - + LOGGER.log(Level.SEVERE, "EXCEPTION IN INCOMING SESSION: ", e); } }); - - try { - jutil.sendSessionAccept(getInitiator(), sid, getContents().get(0).getCreator(), - getContents().get(0).getName(), JingleContent.Senders.initiator, file, - transportSession.createTransport()); - } catch (SmackException.NotConnectedException | SmackException.NoResponseException | - XMPPException.XMPPErrorException | InterruptedException e) { - LOGGER.log(Level.WARNING, "Could not send session-accept.", e); - } } @Override diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/OutgoingJingleFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/OutgoingJingleFileOffer.java index 5199db758..2626df5ae 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/OutgoingJingleFileOffer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/OutgoingJingleFileOffer.java @@ -119,7 +119,7 @@ public class OutgoingJingleFileOffer extends JingleFileTransferSession { @Override public void onException(Exception e) { - LOGGER.log(Level.SEVERE, "Cannot create outgoing Bytestream session: ", e); + LOGGER.log(Level.SEVERE, "EXCEPTION IN OUTGOING SESSION:", e); } }); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/ReceiveTask.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/ReceiveTask.java index 2909f62b9..d562ca4cb 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/ReceiveTask.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/ReceiveTask.java @@ -45,6 +45,7 @@ public class ReceiveTask implements Runnable { @Override public void run() { + LOGGER.log(Level.INFO, "Start ReceiveTask"); JingleFileTransferChild transfer = (JingleFileTransferChild) fileTransfer.getJingleContentDescriptionChildren().get(0); FileOutputStream outputStream = null; InputStream inputStream; @@ -68,12 +69,14 @@ public class ReceiveTask implements Runnable { } outputStream.write(filebuf); + LOGGER.log(Level.INFO, "Received " + read + " bytes."); } catch (IOException e) { LOGGER.log(Level.SEVERE, "Error while receiving data: ", e); } finally { try { session.close(); + LOGGER.log(Level.INFO, "Session closed."); } catch (IOException e) { LOGGER.log(Level.SEVERE, "Could not close InputStream.", e); } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/SendTask.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/SendTask.java index b3c511ce8..33342a164 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/SendTask.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/SendTask.java @@ -42,6 +42,7 @@ public class SendTask implements Runnable { @Override public void run() { + LOGGER.log(Level.INFO, "Start SendTask"); InputStream inputStream; OutputStream outputStream; @@ -57,6 +58,7 @@ public class SendTask implements Runnable { } outputStream.write(filebuf); + LOGGER.log(Level.INFO, "Written " + r + " bytes."); } catch (IOException e) { LOGGER.log(Level.SEVERE, "Could not send file: " + e, e); @@ -64,6 +66,7 @@ public class SendTask implements Runnable { finally { try { session.close(); + LOGGER.log(Level.INFO, "Session closed."); } catch (IOException e) { LOGGER.log(Level.SEVERE, "Could not close session.", e); }