Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-19 16:09:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Daylight Savings bug in recommended notification time calculation

Browse Source
This commit is contained in:
Katherine
2025-04-22 16:56:10 -04:00
committed by GitHub
parent 1ef3a230a1
commit e0ee75e0d0
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
service/src/main/java/org/whispersystems/textsecuregcm/scheduler/SchedulingUtil.java
View File

@@ -38,8 +38,8 @@ public class SchedulingUtil {
final LocalTime preferredTime,
final Clock clock) {
final ZonedDateTime candidateNotificationTime = getZoneOffset(account, clock)
.map(zoneOffset -> ZonedDateTime.now(zoneOffset).with(preferredTime))
final ZonedDateTime candidateNotificationTime = getZoneId(account, clock)
.map(zoneId -> ZonedDateTime.now(clock.withZone(zoneId)).with(preferredTime))
.orElseGet(() -> {
// We couldn't find a reasonable timezone for the account for some reason, so make an educated guess at a
// reasonable time to send a notification based on the account's creation time.
@@ -59,7 +59,7 @@ public class SchedulingUtil {
}
@VisibleForTesting
static Optional<ZoneOffset> getZoneOffset(final Account account, final Clock clock) {
static Optional<ZoneId> getZoneId(final Account account, final Clock clock) {
try {
final Phonenumber.PhoneNumber phoneNumber = PhoneNumberUtil.getInstance().parse(account.getNumber(), null);
@@ -70,7 +70,7 @@ public class SchedulingUtil {
return Optional.empty();
}
final List<ZoneOffset> sortedZoneOffsets = timeZonesForNumber
final List<ZoneId> sortedZoneOffsets = timeZonesForNumber
.stream()
.map(id -> {
try {
@@ -80,9 +80,6 @@ public class SchedulingUtil {
}
})
.filter(Objects::nonNull)
.map(ZoneId::getRules)
.distinct()
.map(zoneRules -> zoneRules.getOffset(clock.instant()))
.sorted()
.toList();