sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

properly calculate remaining size. should fix #1243

This commit is contained in:
Daniel Gultsch 2015-06-03 03:05:20 +02:00
parent a4fb6bb3a3
commit 3eab3291de
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
View File

@ -160,13 +160,18 @@ public class JingleInbandTransport extends JingleTransport {
byte[] buffer = new byte[this.bufferSize]; byte[] buffer = new byte[this.bufferSize];
try { try {
int count = fileInputStream.read(buffer); int count = fileInputStream.read(buffer);
this.remainingSize -= count; if (count == -1) {
if (count != buffer.length && count != -1) { file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
this.onFileTransmissionStatusChanged.onFileTransmitted(file);
fileInputStream.close();
return;
} else if (count != buffer.length) {
int rem = fileInputStream.read(buffer,count,buffer.length-count); int rem = fileInputStream.read(buffer,count,buffer.length-count);
if (rem > 0) { if (rem > 0) {
count += rem; count += rem;
} }
} }
this.remainingSize -= count;
this.digest.update(buffer,0,count); this.digest.update(buffer,0,count);
String base64 = Base64.encodeToString(buffer,0,count, Base64.NO_WRAP); String base64 = Base64.encodeToString(buffer,0,count, Base64.NO_WRAP);
IqPacket iq = new IqPacket(IqPacket.TYPE.SET); IqPacket iq = new IqPacket(IqPacket.TYPE.SET);