wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug when clearing all new message notifications of an account

Browse source
This commit is contained in:
cketti 2022-06-10 16:41:49 +02:00
parent 591d232e26
commit 451a74166b
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/core/src/main/java/com/fsck/k9/notification/NotificationIds.kt
View file

@ -30,8 +30,9 @@ internal object NotificationIds {
}
fun getAllMessageNotificationIds(account: Account): List<Int> {
val singleMessageNotificationIdRange = (0 until NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS) +
(getBaseNotificationId(account) + OFFSET_NEW_MAIL_SINGLE)
val singleMessageNotificationIdRange = (0 until NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS).map { index ->
getBaseNotificationId(account) + OFFSET_NEW_MAIL_SINGLE + index
}
return singleMessageNotificationIdRange.toList() + getNewMailSummaryNotificationId(account)
}

21
app/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt
View file

@ -81,11 +81,22 @@ class NotificationIdsTest {
assertThat(maxNotificationId1 + 1).isEqualTo(minNotificationId2)
}
fun getGeneralNotificationIds(): List<Int> {
@Test
fun `all message notification IDs`() {
val account = createAccount(1)
val notificationIds = NotificationIds.getAllMessageNotificationIds(account)
assertThat(notificationIds).containsExactlyElementsIn(
getNewMessageNotificationIds(account) + NotificationIds.getNewMailSummaryNotificationId(account)
)
}
private fun getGeneralNotificationIds(): List<Int> {
return listOf(NotificationIds.PUSH_NOTIFICATION_ID)
}
fun getAccountNotificationIds(account: Account): List<Int> {
private fun getAccountNotificationIds(account: Account): List<Int> {
return listOf(
NotificationIds.getSendFailedNotificationId(account),
NotificationIds.getCertificateErrorNotificationId(account, true),
@ -94,7 +105,11 @@ class NotificationIdsTest {
NotificationIds.getAuthenticationErrorNotificationId(account, false),
NotificationIds.getFetchingMailNotificationId(account),
NotificationIds.getNewMailSummaryNotificationId(account),
) + (0 until MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS).map { index ->
) + getNewMessageNotificationIds(account)
}
private fun getNewMessageNotificationIds(account: Account): List<Int> {
return (0 until MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS).map { index ->
NotificationIds.getSingleMessageNotificationId(account, index)
}
}