fix: support for daylight saving other than one hour

you-apps · Oct 28, 2024 · b8b5b90 · b8b5b90
1 parent 5746da1
commit b8b5b90
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm
diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm
diff --git a/app/src/main/java/com/bnyro/clock/util/AlarmHelper.kt b/app/src/main/java/com/bnyro/clock/util/AlarmHelper.kt
@@ -17,7 +17,6 @@ import java.util.GregorianCalendar
 
 object AlarmHelper {
     const val EXTRA_ID = "alarm_id"
-    private const val HOUR_IN_MILLIS = 60 * 60 * 1000
 
     @SuppressLint("ScheduleExactAlarm")
     fun enqueue(context: Context, alarm: Alarm) {
@@ -91,9 +90,9 @@ object AlarmHelper {
 
         if (calendar.timeZone.useDaylightTime()) {
             if (calendar.timeZone.inDaylightTime(now) && !calendar.timeZone.inDaylightTime(calendar.time)) {
-                calendar.timeInMillis += HOUR_IN_MILLIS
+                calendar.timeInMillis += calendar.timeZone.dstSavings
             } else if (!calendar.timeZone.inDaylightTime(now) && calendar.timeZone.inDaylightTime(calendar.time)) {
-                calendar.timeInMillis -= HOUR_IN_MILLIS
+                calendar.timeInMillis -= calendar.timeZone.dstSavings
             }
         }
     }