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

Fix class cast exceptions with SchedulingUtil

Browse Source
This commit is contained in:
ravi-signal
2025-05-29 18:14:23 -05:00
committed by GitHub
parent a7ea42adc3
commit bbee80dbd0
2 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,16 +5,21 @@ import com.google.i18n.phonenumbers.NumberParseException;
import com.google.i18n.phonenumbers.PhoneNumberToTimeZonesMapper;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.Phonenumber;
import org.whispersystems.textsecuregcm.storage.Account;
import java.time.Clock;
import java.time.Instant;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.zone.ZoneRules;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.whispersystems.textsecuregcm.storage.Account;
public class SchedulingUtil {
@@ -70,7 +75,10 @@ public class SchedulingUtil {
return Optional.empty();
}
final List<ZoneId> sortedZoneOffsets = timeZonesForNumber
final Instant now = clock.instant();
// Consider each unique ZoneRules and pick an arbitrary representative ZoneId for it
final Map<ZoneRules, ZoneId> byOffset = timeZonesForNumber
.stream()
.map(id -> {
try {
@@ -80,10 +88,19 @@ public class SchedulingUtil {
}
})
.filter(Objects::nonNull)
.sorted()
.collect(Collectors.toMap(
ZoneId::getRules,
Function.identity(),
(v1, v2) -> v2));
// Sort the ZoneRules by the offsets they produce
final List<ZoneRules> zoneRulesSortedByOffset = byOffset.keySet()
.stream()
.sorted(Comparator.comparing(z -> z.getOffset(now)))
.toList();
return Optional.of(sortedZoneOffsets.get(sortedZoneOffsets.size() / 2));
// Select the "middle" ZoneRule and return one of the ZoneIds that have that ZoneRule
return Optional.of(byOffset.get(zoneRulesSortedByOffset.get(zoneRulesSortedByOffset.size() / 2)));
} catch (final NumberParseException e) {
return Optional.empty();
}