From 50c474e9ef4c5e7746aa41265e5d6f26e6b2145c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Mon, 4 Sep 2023 14:12:59 +0100 Subject: [PATCH] Fix crash when timezone has no next DST transition --- .../gadgetbridge/externalevents/TimeChangeReceiver.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java index 50147b125..b577af466 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java @@ -89,6 +89,11 @@ public class TimeChangeReceiver extends BroadcastReceiver { final ZoneRules zoneRules = zoneId.getRules(); final Instant now = Instant.now(); final ZoneOffsetTransition transition = zoneRules.nextTransition(now); + if (transition == null) { + LOG.warn("No DST transition found for {}", zoneId); + return; + } + final long nextDstMillis = transition.getInstant().toEpochMilli(); final long delayMillis = nextDstMillis - now.toEpochMilli() + 5000L;