From 82f3c0ef5177993ebb64daa3a50e0ea7fd1dcd0f Mon Sep 17 00:00:00 2001 From: sgallese Date: Sun, 31 Oct 2021 14:02:18 -0700 Subject: [PATCH] Match UTC timezone logic in JVM code --- .../src/commonMain/kotlin/org/isoron/platform/time/Dates.kt | 3 ++- .../commonTest/kotlin/org/isoron/platform/time/DatesTest.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/uhabits-core/src/commonMain/kotlin/org/isoron/platform/time/Dates.kt b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/time/Dates.kt index 5a4e369f8..2a681c981 100644 --- a/uhabits-core/src/commonMain/kotlin/org/isoron/platform/time/Dates.kt +++ b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/time/Dates.kt @@ -25,6 +25,7 @@ import kotlinx.datetime.Instant import kotlinx.datetime.LocalDateTime import kotlinx.datetime.Month import kotlinx.datetime.TimeZone +import kotlinx.datetime.TimeZone.Companion.UTC import kotlinx.datetime.offsetAt import kotlinx.datetime.toInstant import kotlinx.datetime.toLocalDateTime @@ -265,7 +266,7 @@ data class LocalDate(val daysSince2000: Int) { minute = minute, second = 0 ).toInstant( - getTimeZone() + UTC ).toEpochMilliseconds() if (getLocalTime() > time) { diff --git a/uhabits-core/src/commonTest/kotlin/org/isoron/platform/time/DatesTest.kt b/uhabits-core/src/commonTest/kotlin/org/isoron/platform/time/DatesTest.kt index d92c5eb1d..bd915e734 100644 --- a/uhabits-core/src/commonTest/kotlin/org/isoron/platform/time/DatesTest.kt +++ b/uhabits-core/src/commonTest/kotlin/org/isoron/platform/time/DatesTest.kt @@ -420,7 +420,7 @@ class DatesTest : BaseUnitTest() { fun testGetUpcomingTimeInMillis_withTimeZone() { LocalDate.fixedLocalTime = FIXED_LOCAL_TIME LocalDate.fixedTimeZone = TimeZone.of("GMT-$HOUR_OFFSET") - val expected = unixTime(2015, Month.JANUARY, 25, 10, 1) + val expected = unixTime(2015, Month.JANUARY, 25, 13, 1) val upcomingTimeMillis = getUpcomingTimeInMillis(10, 1) assertEquals(expected, upcomingTimeMillis) }