empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileScheduleViewModel.kt
View file

@ -60,7 +60,8 @@ class EditNotificationProfileScheduleViewModel(
}
fun setEndTime(hour: Int, minute: Int) {
scheduleSubject.onNext(schedule.copy(end = hour * 100 + minute))
val adjustedEndHour = if (hour == 0) 24 else hour
scheduleSubject.onNext(schedule.copy(end = adjustedEndHour * 100 + minute))
}
fun setEnabled(enabled: Boolean) {

12
app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt
View file

@ -180,8 +180,9 @@ object SignalDatabaseMigrations {
private const val REACTION_REFACTOR = 121
private const val PNI = 122
private const val NOTIFICATION_PROFILES = 123
private const val NOTIFICATION_PROFILES_END_FIX = 124
const val DATABASE_VERSION = 123
const val DATABASE_VERSION = 124
@JvmStatic
fun migrate(context: Context, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
@ -2222,6 +2223,15 @@ object SignalDatabaseMigrations {
db.execSQL("CREATE INDEX notification_profile_schedule_profile_index ON notification_profile_schedule (notification_profile_id)")
db.execSQL("CREATE INDEX notification_profile_allowed_members_profile_index ON notification_profile_allowed_members (notification_profile_id)")
}
if (oldVersion < NOTIFICATION_PROFILES_END_FIX) {
db.execSQL(
// language=sql
"""
UPDATE notification_profile_schedule SET end = 2400 WHERE end = 0
""".trimIndent()
)
}
}
@JvmStatic

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)
}

9
app/src/test/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfileScheduleTest.kt
View file

@ -1,5 +1,7 @@
package org.thoughtcrime.securesms.notifications.profiles
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.`is`
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.BeforeClass
@ -15,6 +17,7 @@ class NotificationProfileScheduleTest {
private val sunday0am: LocalDateTime = LocalDateTime.of(2021, 7, 4, 0, 0, 0)
private val sunday1am: LocalDateTime = LocalDateTime.of(2021, 7, 4, 1, 0, 0)
private val sunday9am: LocalDateTime = LocalDateTime.of(2021, 7, 4, 9, 0, 0)
private val sunday930am: LocalDateTime = LocalDateTime.of(2021, 7, 4, 9, 30, 0)
private val sunday10pm: LocalDateTime = LocalDateTime.of(2021, 7, 4, 22, 0, 0)
private val monday0am: LocalDateTime = sunday0am.plusDays(1)
@ -139,4 +142,10 @@ class NotificationProfileScheduleTest {
assertFalse(schedule.isCurrentlyActive(tuesday9am.toMillis(ZoneOffset.UTC)))
assertFalse(schedule.isCurrentlyActive(tuesday10pm.toMillis(ZoneOffset.UTC)))
}
@Test
fun `when end time is midnight return midnight of next day from now`() {
val schedule = NotificationProfileSchedule(id = 1L, enabled = false, start = 0, end = 2400, daysEnabled = DayOfWeek.values().toSet())
assertThat(schedule.endDateTime(sunday930am), `is`(monday0am))
}
}