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

1) FileTransfer#isDone() will now return true on refused. SMACK-158

Browse source 
2) Learned to spell.
3) Changed to enums.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@5163 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Alex Wenckus 2006-09-01 17:38:53 +00:00 • committed by alex
parent 8576a13de7
commit 39662d3b0f
3 changed files with 59 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

30
source/org/jivesoftware/smackx/filetransfer/IncomingFileTransfer.java
View file

@ -47,8 +47,6 @@ public class IncomingFileTransfer extends FileTransfer {
private FileTransferRequest recieveRequest;
private Thread transferThread;
private InputStream inputStream;
protected IncomingFileTransfer(FileTransferRequest request,
@ -119,7 +117,7 @@ public class IncomingFileTransfer extends FileTransfer {
throw new IllegalArgumentException("File cannot be null");
}
transferThread = new Thread(new Runnable() {
Thread transferThread = new Thread(new Runnable() {
public void run() {
try {
inputStream = negotiateStream();
@ -132,22 +130,22 @@ public class IncomingFileTransfer extends FileTransfer {
OutputStream outputStream = null;
try {
outputStream = new FileOutputStream(file);
setStatus(Status.IN_PROGRESS);
setStatus(Status.in_progress);
writeToStream(inputStream, outputStream);
}
catch (XMPPException e) {
setStatus(FileTransfer.Status.ERROR);
setError(Error.STREAM);
setStatus(Status.error);
setError(Error.stream);
setException(e);
}
catch (FileNotFoundException e) {
setStatus(FileTransfer.Status.ERROR);
setError(Error.BAD_FILE);
setStatus(Status.error);
setError(Error.bad_file);
setException(e);
}
if (getStatus().equals(Status.IN_PROGRESS))
setStatus(Status.COMPLETE);
if (getStatus().equals(Status.in_progress))
setStatus(Status.complete);
try {
if (inputStream != null) {
inputStream.close();
@ -157,31 +155,31 @@ public class IncomingFileTransfer extends FileTransfer {
}
}
catch (IOException e) {
/** We need to do something here **/
}
}
}, "File Transfer " + streamID);
transferThread.start();
}
private void handleXMPPException(XMPPException e) {
setStatus(FileTransfer.Status.ERROR);
setStatus(FileTransfer.Status.error);
setException(e);
}
private InputStream negotiateStream() throws XMPPException {
setStatus(Status.NEGOTIATING_TRANSFER);
setStatus(Status.negotiating_transfer);
StreamNegotiator streamNegotiator = negotiator
.selectStreamNegotiator(recieveRequest);
setStatus(Status.NEGOTIATING_STREAM);
setStatus(Status.negotiating_stream);
InputStream inputStream = streamNegotiator
.createIncomingStream(recieveRequest.getStreamInitiation());
setStatus(Status.NEGOTIATED);
setStatus(Status.negotiated);
return inputStream;
}
public void cancel() {
setStatus(Status.CANCLED);
setStatus(Status.cancelled);
}
}