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

Garmin: Fix checksum of concatenated fit files

Browse Source
This commit is contained in:
José Rebelo
2025-05-21 20:58:05 +01:00
parent ed732493e2
commit d2210265f3
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminByteBufferReader.java
+8
View File
@@ -31,6 +31,14 @@ public class GarminByteBufferReader {
return byteBuffer.position();
}
public void setPosition(final int position) {
byteBuffer.position(position);
}
public int getLimit() {
return byteBuffer.limit();
}
public int readShort() {
return Short.toUnsignedInt(byteBuffer.getShort());
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/FitFile.java
+5 -1
View File
@@ -106,10 +106,14 @@ public class FitFile {
}
garminByteBufferReader.setByteOrder(ByteOrder.LITTLE_ENDIAN);
final int fileCrc = garminByteBufferReader.readShort();
final int actualCrc = ChecksumCalculator.computeCrc(fileContents, 0, fileContents.length - 2);
final int actualCrc = ChecksumCalculator.computeCrc(fileContents, 0, garminByteBufferReader.getPosition() - 2);
if (fileCrc != actualCrc) {
throw new FitParseException("Wrong CRC for FIT file: got " + actualCrc + " expected " + fileCrc);
}
if (garminByteBufferReader.getPosition() < garminByteBufferReader.getLimit()) {
LOG.warn("There are {} bytes after the fit file", garminByteBufferReader.getLimit() - garminByteBufferReader.getPosition());
// TODO a fit file should actually be multiple fit files
}
return new FitFile(header, dataRecords);
}