From 38f54b140c03286d4af30a05b47286ccf9b5a81c Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Sat, 10 Jun 2017 01:53:59 +0200 Subject: [PATCH] Typo --- ...nitiatorOutgoingFileTransferInitiated.java | 44 ++++++++++--------- .../jingle_s5b/JingleS5BTransportManager.java | 4 +- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/handler/InitiatorOutgoingFileTransferInitiated.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/handler/InitiatorOutgoingFileTransferInitiated.java index ed606f0c1..e9099382c 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/handler/InitiatorOutgoingFileTransferInitiated.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/handler/InitiatorOutgoingFileTransferInitiated.java @@ -61,26 +61,7 @@ public class InitiatorOutgoingFileTransferInitiated implements JingleSessionHand switch (jingle.getAction()) { case session_accept: - BytestreamSession session; - - try { - session = bm.outgoingInitiatedSession(jingle); - } catch (Exception e) { - //TODO - return null; - } - - HashElement fileHash; - byte[] buf = new byte[(int) file.length()]; - - try { - fileHash = FileAndHashReader.readAndCalculateHash(file, buf, HashManager.ALGORITHM.SHA_256); - session.getOutputStream().write(buf); - session.close(); - } catch (IOException e) { - //TODO: - return null; - } + startTransfer(bm, jingle); break; case session_terminate: break; @@ -90,4 +71,27 @@ public class InitiatorOutgoingFileTransferInitiated implements JingleSessionHand } return IQ.createResultIQ(jingle); } + + public void startTransfer(AbstractJingleTransportManager transportManager, Jingle jingle) { + BytestreamSession session; + + try { + session = transportManager.outgoingInitiatedSession(jingle); + } catch (Exception e) { + //TODO + return; + } + + HashElement fileHash; + byte[] buf = new byte[(int) file.length()]; + + try { + fileHash = FileAndHashReader.readAndCalculateHash(file, buf, HashManager.ALGORITHM.SHA_256); + session.getOutputStream().write(buf); + session.close(); + } catch (IOException e) { + //TODO: + return; + } + } } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_s5b/JingleS5BTransportManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_s5b/JingleS5BTransportManager.java index d10f69022..716a914cd 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_s5b/JingleS5BTransportManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_s5b/JingleS5BTransportManager.java @@ -140,7 +140,7 @@ public final class JingleS5BTransportManager extends AbstractJingleTransportMana public Jingle createSessionAccept(Jingle request) throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException { JingleContent receivedContent = request.getContents().get(0); - JingleS5BTransport receviedTransport = (JingleS5BTransport) receivedContent.getJingleTransports().get(0); + JingleS5BTransport receivedTransport = (JingleS5BTransport) receivedContent.getJingleTransports().get(0); Jingle.Builder jb = Jingle.getBuilder(); jb.setResponder(connection().getUser()) .setAction(JingleAction.session_accept) @@ -151,7 +151,7 @@ public final class JingleS5BTransportManager extends AbstractJingleTransportMana .setCreator(receivedContent.getCreator()) .setName(receivedContent.getName()) .setDescription(receivedContent.getDescription()) - .addTransport(createJingleContentTransport(request.getInitiator(), receviedTransport)); + .addTransport(createJingleContentTransport(request.getInitiator(), receivedTransport)); jb.addJingleContent(cb.build()); Jingle jingle = jb.build();