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

Improve SchedulingUtil.getZoneId for PhoneNumberType.UNKONWN numbers

Browse Source
This commit is contained in:
Chris Eager
2026-02-05 13:41:00 -06:00
committed by Chris Eager
parent 5ec8628b51
commit c13a34b2c8
2 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
service/src/test/java/org/whispersystems/textsecuregcm/scheduler/SchedulingUtilTest.java
View File

@@ -91,33 +91,42 @@ class SchedulingUtilTest {
@Test
void zoneIdSelectionSingleOffset() {
final Account account = mock(Account.class);
final Phonenumber.PhoneNumber phoneNumber = PhoneNumberUtil.getInstance().getExampleNumber("DE");
when(account.getNumber())
.thenReturn(PhoneNumberUtil.getInstance().format(phoneNumber , PhoneNumberUtil.PhoneNumberFormat.E164));
final String e164 = PhoneNumberUtil.getInstance().format(phoneNumber, PhoneNumberUtil.PhoneNumberFormat.E164);
final Instant now = Instant.now();
assertEquals(
ZoneId.of("Europe/Berlin").getRules().getOffset(now),
SchedulingUtil.getZoneId(account, TestClock.pinned(now)).orElseThrow().getRules().getOffset(now));
SchedulingUtil.getZoneId(e164, TestClock.pinned(now)).orElseThrow().getRules().getOffset(now));
}
@Test
void zoneIdSelectionMultipleOffsets() {
final Account account = mock(Account.class);
// A US VOIP number spans multiple time zones, we should pick a 'middle' one
final Phonenumber.PhoneNumber phoneNumber =
PhoneNumberUtil.getInstance().getExampleNumberForType("US", PhoneNumberUtil.PhoneNumberType.VOIP);
when(account.getNumber())
.thenReturn(PhoneNumberUtil.getInstance().format(phoneNumber, PhoneNumberUtil.PhoneNumberFormat.E164));
final String e164 = PhoneNumberUtil.getInstance().format(phoneNumber, PhoneNumberUtil.PhoneNumberFormat.E164);
final Instant now = Instant.now();
assertEquals(
ZoneId.of("America/Chicago").getRules().getOffset(now),
SchedulingUtil.getZoneId(account, TestClock.pinned(now)).orElseThrow().getRules().getOffset(now));
SchedulingUtil.getZoneId(e164, TestClock.pinned(now)).orElseThrow().getRules().getOffset(now));
}
@Test
void zoneIdSelectionUnknownNumber() {
// An invalid number will fall back to a geographical lookup. Even if that is not technically correct for the number,
// it will give a time zone for the region, rather than an Optional.empty() result
final Phonenumber.PhoneNumber phoneNumber =
PhoneNumberUtil.getInstance().getInvalidExampleNumber("US");
final String e164 = PhoneNumberUtil.getInstance().format(phoneNumber, PhoneNumberUtil.PhoneNumberFormat.E164);
final Instant now = Instant.now();
assertEquals(
ZoneId.of("America/New_York").getRules().getOffset(now),
SchedulingUtil.getZoneId(e164, TestClock.pinned(now)).orElseThrow().getRules().getOffset(now));
}
}