mirror of
https://github.com/owncloud/android-library.git
synced 2025-06-07 16:06:08 +00:00
Merge pull request #436 from owncloud/fix/final_chunk_size
Fix a protocol exception when uploading chunked files
This commit is contained in:
commit
37bae10618
@ -86,7 +86,8 @@ public class ChunkFromFileRequestBody extends FileRequestBody {
|
|||||||
|
|
||||||
readCount = mChannel.read(mBuffer);
|
readCount = mChannel.read(mBuffer);
|
||||||
|
|
||||||
sink.getBuffer().write(mBuffer.array(), 0, readCount);
|
int bytesToWriteInBuffer = (int) Math.min(readCount, mFile.length() - mTransferred);
|
||||||
|
sink.getBuffer().write(mBuffer.array(), 0, bytesToWriteInBuffer);
|
||||||
|
|
||||||
sink.flush();
|
sink.flush();
|
||||||
|
|
||||||
@ -102,14 +103,12 @@ public class ChunkFromFileRequestBody extends FileRequestBody {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Timber.v("Chunk with size " + mChunkSize + " written in request body");
|
|
||||||
|
|
||||||
} catch (Exception exception) {
|
} catch (Exception exception) {
|
||||||
Timber.e(exception);
|
Timber.e(exception, "Transferred " + mTransferred + " bytes from a total of " + mFile.length());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOffset(long offset) {
|
public void setOffset(long offset) {
|
||||||
this.mOffset = offset;
|
this.mOffset = offset;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user