Download service refactoring: multiple downloads and cancellation support

[pub/Android/ownCloud.git] / src / eu / alefzero / webdav / ChunkFromFileChannelRequestEntity.java

diff --git a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
index bcba354..da390a6 100644 (file)
--- a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
+++ b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
@@ -89,14 +89,13 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity {
         int readCount = 0;
         
        try {
-            //while ((i = instream.read(tmp)) >= 0) {
             mChannel.position(mOffset);
-            while (mChannel.position() < mOffset + mSize) {
+            while (mChannel.position() < mOffset + mSize && mChannel.position() < mChannel.size()) {
                 readCount = mChannel.read(mBuffer);
                 out.write(mBuffer.array(), 0, readCount);
                 mBuffer.clear();
                 if (mListener != null) 
-                    mListener.transferProgress(readCount);
+                    mListener.onTransferProgress(readCount);
             }
             
         } catch (IOException io) {