MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-27 12:26:48 +01:00
Code Releases Wiki Activity

Garmin: Fix crash on timezones without DST

Browse Source
This commit is contained in:
José Rebelo 2024-10-26 16:53:30 +01:00
parent 8cf6c457ac
commit bbadb2b1ef
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/messages/CurrentTimeRequestMessage.java
View File

@ -34,11 +34,35 @@ public class CurrentTimeRequestMessage extends GFDIMessage {
final int garminTimestamp = GarminTimeUtils.unixTimeToGarminTimestamp((int) now.getEpochSecond());
final ZoneOffsetTransition nextTransitionStart = zoneRules.nextTransition(now);
final int nextTransitionStartsTs = (int) nextTransitionStart.toEpochSecond();
final int nextTransitionEndsTs = (int) zoneRules.nextTransition(nextTransitionStart.getInstant()).toEpochSecond();
final int nextTransitionEndsGarminTs;
final int nextTransitionStartsGarminTs;
if (nextTransitionStart != null) {
final int nextTransitionStartsTs = (int) nextTransitionStart.toEpochSecond();
nextTransitionStartsGarminTs = GarminTimeUtils.unixTimeToGarminTimestamp(nextTransitionStartsTs);
LOG.info("Processing current time request #{}: time={}, DST={}, ofs={}", referenceID, garminTimestamp, dstOffset, timeZoneOffset);
final ZoneOffsetTransition nextTransitionEnd = zoneRules.nextTransition(nextTransitionStart.getInstant());
if (nextTransitionEnd != null) {
final int nextTransitionEndsTs = (int) nextTransitionEnd.toEpochSecond();
nextTransitionEndsGarminTs = GarminTimeUtils.unixTimeToGarminTimestamp(nextTransitionEndsTs);
} else {
nextTransitionEndsGarminTs = 0;
}
} else {
nextTransitionEndsGarminTs = 0;
nextTransitionStartsGarminTs = 0;
}
LOG.info(
"Processing current time request #{}: time={}, DST={}, ofs={}, nextTransitionEnds={}, nextTransitionStarts={}",
referenceID,
garminTimestamp,
dstOffset,
timeZoneOffset,
nextTransitionEndsGarminTs,
nextTransitionStartsGarminTs
);
final MessageWriter writer = new MessageWriter(response);
writer.writeShort(0); // packet size will be filled below
@ -48,8 +72,8 @@ public class CurrentTimeRequestMessage extends GFDIMessage {
writer.writeInt(referenceID);
writer.writeInt(garminTimestamp);
writer.writeInt(timeZoneOffset);
writer.writeInt(GarminTimeUtils.unixTimeToGarminTimestamp(nextTransitionEndsTs));
writer.writeInt(GarminTimeUtils.unixTimeToGarminTimestamp(nextTransitionStartsTs));
writer.writeInt(nextTransitionEndsGarminTs);
writer.writeInt(nextTransitionStartsGarminTs);
return true;
}
}