demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Zepp OS 3/4: Fix download of single-chunk small files

Browse Source
This commit is contained in:
José Rebelo
2025-03-22 19:07:48 +00:00
parent 2a790befb4
commit 59dd321069
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/filetransfer/FileTransferImplV3.java
+20 -10
View File
@@ -298,13 +298,11 @@ public class FileTransferImplV3 extends AbstractFileTransferImpl {
// Start of a chunk
receivePacketBuffer.reset();
LOG.debug("Got start of chunk - {} bytes", payload.length);
final ByteBuffer buf = ByteBuffer.wrap(payload).order(ByteOrder.LITTLE_ENDIAN);
buf.get(); // Discard first byte
final byte flags = buf.get();
final boolean firstChunk = (flags == FLAG_FIRST_CHUNK);
currentReceiveChunkIsLast = (flags == FLAG_LAST_CHUNK);
final boolean firstChunk = (flags & FLAG_FIRST_CHUNK) != 0;
currentReceiveChunkIsLast = (flags & FLAG_LAST_CHUNK) != 0;
final byte index = buf.get();
currentReceiveChunkSize = buf.getShort();
@@ -318,11 +316,21 @@ public class FileTransferImplV3 extends AbstractFileTransferImpl {
return;
}
LOG.debug("Starting a new chunk of {} bytes at index {}", currentReceiveChunkSize, currentReceiveRequest.getIndex());
LOG.debug(
"Got start of chunk - payload={}b, firstChunk={}, lastChunk={}, index={}, chunkSize={}",
payload.length, firstChunk, currentReceiveChunkIsLast, index, currentReceiveChunkSize
);
receivePacketBuffer.write(payload, buf.position(), buf.limit() - buf.position());
}
LOG.trace(
"Chunk buffer: {} of {}, currentReceiveChunkIsLast={}",
receivePacketBuffer.size(),
currentReceiveChunkSize,
currentReceiveChunkIsLast
);
if (receivePacketBuffer.size() >= currentReceiveChunkSize) {
// Finished a chunk
@@ -374,13 +382,15 @@ public class FileTransferImplV3 extends AbstractFileTransferImpl {
return;
}
currentReceiveRequest.getCallback().onFileDownloadFinish(
currentReceiveRequest.getUrl(),
currentReceiveRequest.getFilename(),
data
);
final FileTransferRequest requestBackup = currentReceiveRequest;
resetReceive();
requestBackup.getCallback().onFileDownloadFinish(
requestBackup.getUrl(),
requestBackup.getFilename(),
data
);
}
currentReceiveChunkSize = -1;