Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 01:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with schedule end being set to midnight.

Browse Source
This commit is contained in:
Cody Henthorne
2021-12-20 13:16:31 -05:00
committed by Greyson Parrelli
parent b69ffe4e15
commit adcb1bae13
4 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfileSchedule.kt
View File

@@ -56,7 +56,8 @@ data class NotificationProfileSchedule(
}
fun endTime(): LocalTime {
return LocalTime.of(end / 100, end % 100)
val adjustedEnd = if (end == 2400) 0 else end
return LocalTime.of(adjustedEnd / 100, adjustedEnd % 100)
}
fun endDateTime(localNow: LocalDateTime): LocalDateTime {
@@ -73,8 +74,8 @@ data class NotificationProfileSchedule(
fun Int.toLocalDateTime(now: LocalDateTime): LocalDateTime {
if (this == 2400) {
return now.plusDays(1).withHour(0)
return now.plusDays(1).withHour(0).withMinute(0).withSecond(0)
}
return now.withHour(this / 100).withMinute(this % 100)
return now.withHour(this / 100).withMinute(this % 100).withSecond(0)
}