MarcoBuster
/
Gadgetbridge
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge
1
0
Fork 0
Code Releases Wiki Activity

huawei: fileupload: Fix for magicwatch 2 

* magicwatch2 reporing MTU smaller than SliceSize and upload fail
when using slice size
This commit is contained in:
Vitaliy Tomin 2024-04-02 11:31:46 +08:00
parent b543e4717e
commit 71389c3fce
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
View File

@ -679,7 +679,8 @@ public class HuaweiPacket {
int sliceHeaderLenght =7;
int bodyHeaderLength = 2; // sID + cID
int footerLength = 2; //CRC16
int maxBodySize = paramsProvider.getSliceSize() - headerLength - sliceHeaderLenght - footerLength;
int sliceSize = Math.min(paramsProvider.getSliceSize(), paramsProvider.getMtu()); // at least on magicwatch2 slize size reported bigger than MTU and upload fail
int maxBodySize = sliceSize - headerLength - sliceHeaderLenght - footerLength;
int packetCount = (int) Math.ceil(((double) fileChunk.length ) / (double) maxBodySize);
ByteBuffer buffer = ByteBuffer.wrap(fileChunk);
@ -687,9 +688,11 @@ public class HuaweiPacket {
byte fileType = 0x01; //TODO: 1 - watchface, 2 - music
int sliceStart = uploadPosition;
for (int i = 0; i < packetCount; i++) {
short packetSize = (short) Math.min(paramsProvider.getSliceSize(), buffer.remaining() + headerLength + sliceHeaderLenght + footerLength);
short packetSize = (short) Math.min(sliceSize, buffer.remaining() + headerLength + sliceHeaderLenght + footerLength);
ByteBuffer packet = ByteBuffer.allocate(packetSize);
short contentSize = (short) (packetSize - headerLength - sliceHeaderLenght - footerLength);
int start = packet.position();