Keep size of received byte of current task

Author: velitasali

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.genonbeta.coolsocket</groupId>
     <artifactId>main</artifactId>
-    <version>1.0.1.1</version>
+    <version>1.0.1.2</version>
     <name>CoolSocket</name>
     <description>Socket implementation</description>
     <url>https://github.com/genonbeta/CoolSocket</url>

src/main/java/com/genonbeta/CoolSocket/CoolTransfer.java

@@ -310,11 +310,12 @@ protected void onRun()
 
 							if (Flag.CONTINUE.equals(getFlag())) {
 								InputStream inputStream = getSocket().getInputStream();
-								onOrientatingStreams(this, inputStream, getOutputStream());
-
 								int len = 0;
 								long lastRead = System.currentTimeMillis();
 
+								onOrientatingStreams(this, inputStream, getOutputStream());
+								getTransferProgress().resetCurrentTransferredByte();
+
 								while (len != -1) {
 									synchronized (getBlockingObject()) {
 										if ((len = inputStream.read(getBuffer())) > 0) {
@@ -456,11 +457,10 @@ protected void onRun()
 
 						if (Flag.CONTINUE.equals(getFlag())) {
 							OutputStream outputStream = getSocket().getOutputStream();
-
-							onOrientatingStreams(this, getInputStream(), outputStream);
-
 							int len = 0;
 
+							onOrientatingStreams(this, getInputStream(), outputStream);
+							getTransferProgress().resetCurrentTransferredByte();
 							getTransferProgress().incrementTransferredByte(getSkippedBytes());
 
 							while (len != -1) {
@@ -532,6 +532,7 @@ public void skipBytes(long bytes) throws IOException
 	public static class TransferProgress<T>
 	{
 		private long mStartTime = System.currentTimeMillis();
+		private long mCurrentTransferredByte;
 		private long mTransferredByte;
 		private long mTotalByte;
 		private long mTimeElapsed;
@@ -548,6 +549,7 @@ public int calculatePercentage(long max, long current)
 
 		public long decrementTransferredByte(long size)
 		{
+			mCurrentTransferredByte -= size;
 			mTransferredByte -= size;
 			return mTransferredByte;
 		}
@@ -621,6 +623,7 @@ public long getTransferredByte()
 
 		public long incrementTransferredByte(long size)
 		{
+			mCurrentTransferredByte += size;
 			mTransferredByte += size;
 			return mTransferredByte;
 		}
@@ -641,6 +644,10 @@ public boolean isInterrupted()
 			return mInterrupted;
 		}
 
+		public void resetCurrentTransferredByte() {
+			mCurrentTransferredByte = 0;
+		}
+
 		public void setTotalByte(long totalByte)
 		{
 			mTotalByte = totalByte;