From 5bb1bb28a784f61d7887e2b281fa9ec16f34f388 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 24 Feb 2016 17:53:46 +0100
Subject: [client] Better handling of server side errors on upload

---
 .../openslx/dozmod/filetransfer/UploadTask.java    | 25 +++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'dozentenmodul/src/main/java')

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 bff973b5..71c7add8 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/UploadTask.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/UploadTask.java
@@ -96,7 +96,10 @@ public class UploadTask extends TransferTask {
 				remoteError = null;
 				consecutiveInitFails.set(0);
 			} else {
-				remoteError = uploader.getRemoteError();
+				String err = uploader.getRemoteError();
+				if (err != null) {
+					remoteError = err;
+				}
 				consecutiveInitFails.incrementAndGet();
 			}
 			transferEnded(this, ret);
@@ -143,18 +146,20 @@ public class UploadTask extends TransferTask {
 				speed += thread.getCurrentSpeed();
 			}
 		}
-		// 0 = complete, 1 = missing, 2 = uploading, 3 = queued for copying, 4 = copying
-		if (blocks != null) {
-			int missing = 0;
-			for (byte b : blocks) {
-				if (b != 0) {
-					missing++;
+		if (speed != 0) {
+			// 0 = complete, 1 = missing, 2 = uploading, 3 = queued for copying, 4 = copying, 5 = hashing
+			if (blocks != null) {
+				int missing = 0;
+				for (byte b : blocks) {
+					if (b != 0) {
+						missing++;
+					}
 				}
+				final long bytesRemaining = CHUNK_SIZE * (long) missing;
+				timeRemaining = (1000 * bytesRemaining) / (speed + 1);
 			}
-			final long bytesRemaining = CHUNK_SIZE * (long) missing;
-			timeRemaining = (1000 * bytesRemaining) / (speed + 1);
 		}
-		if (error == null && remoteError != null) {
+		if (remoteError != null && (error == null || remoteError.equals("Out of disk space"))) {
 			error = remoteError;
 		}
 		TransferEvent event = new TransferEvent(state, blocks, speed, timeRemaining, error);
-- 
cgit v1.2.3-55-g7522