1 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
index b35088b..0447e68 100644
--- a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
+++ b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
@@ -140,7 +140,7 @@ public class ConnectionHandler implements IncomingEvent
 		long actual;
 		for ( Integer block : blocks ) {
 			actual = block * Globals.blockSize;
-			uploader.sendRange( (int)actual, ( ( fileSize - actual ) < Globals.blockSize ) ? (int)fileSize - 1 : ( block + 1 ) * Globals.blockSize - 1 );	// TODO: change this int into long
+			uploader.prepareSendRange( actual, ( ( fileSize - actual ) < Globals.blockSize ) ? fileSize : ( block + 1 ) * Globals.blockSize );
 			uploader.sendFile( fileName );
 		}
 		uploader.close();
@@ -154,7 +154,7 @@ public class ConnectionHandler implements IncomingEvent
 	public void incomingDownloader( Downloader downloader ) throws IOException
 	{
 		log.debug( "Client wants to upload" );
-		int startOfRange = 0;
+		long startOfRange = 0;
 		String token = "";
 		// try to read meta data
 		while ( downloader.readMetaData() ) {
@@ -167,7 +167,7 @@ public class ConnectionHandler implements IncomingEvent
 			}
 
 			startOfRange = downloader.getStartOfRange();
-			
+
 			if ( downloader.getDiffOfRange() <= 0 ) {
 				return;
 			}
@@ -178,15 +178,15 @@ public class ConnectionHandler implements IncomingEvent
 				downloader.close();
 				return;
 			}
-			
-			int blockNumber = startOfRange / Globals.blockSize;
+
+			int blockNumber = (int) ( startOfRange / Globals.blockSize );
 			UploadingImage image = connections.get( token ).image;
 			image.setNeedsCheck( blockNumber );
 			image.increaseTransmittedTimes( blockNumber );
 			log.debug( "Block " + blockNumber + " was transmitted " + image.getTimesTransmitted( blockNumber ) + " time(s)." );
 
 			downloader.setOutputFilename( connections.get( token ).filepath );
-			downloader.readBinary();
+			downloader.receiveBinary();
 		}
 		downloader.close();
 	}