From e636b5abeea35c9d94ded79fcf51df97fb41aa9d Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 16 Jul 2015 17:02:04 +0200 Subject: [client] set upload filesize to the length of the given file --- .../java/org/openslx/dozmod/filetransfer/UploadTask.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/UploadTask.java b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/UploadTask.java index d9c9bee1..94576ef9 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/UploadTask.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/UploadTask.java @@ -36,7 +36,6 @@ public class UploadTask implements Runnable { this.port = port; this.uploadToken = uploadToken; this.uploadFile = uploadFile; - } /** @@ -48,16 +47,10 @@ public class UploadTask implements Runnable { Uploader upload = null; try { upload = new Uploader(host, port, null, uploadToken); // TODO: SSL + final Uploader uploader = upload; + final long fileSize = uploadFile.length(); - final Uploader ul = upload; - /* BROKEN CODE - FIXME class imports - final long fileSize = Image.Filesize = uploadFile.length(); - BROKEN CODE - FIXME class imports */ - final long fileSize = 1000000; - - LOGGER.debug("Filesize: " + fileSize); - - final boolean ret = upload.upload(uploadFile.getAbsolutePath(), new UploadStatusCallback() { + final boolean ret = uploader.upload(uploadFile.getAbsolutePath(), new UploadStatusCallback() { // progress counter private long totalBytesRead = 0; // initialize the counters needed for speed calculations @@ -83,7 +76,7 @@ public class UploadTask implements Runnable { @Override public void uploadError(String message) { LOGGER.error("Upload error: " + message); - //Gui.showMessageBox(null, message, MessageType.ERROR, LOGGER, null); + // TODO } }); -- cgit v1.2.3-55-g7522