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

Fix removing multiple notifications at once

Browse source
This commit is contained in:
cketti 2022-07-26 18:03:01 +02:00
parent b1083bef93
commit 7dbae49c8e
2 changed files with 63 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt
View file

@ -108,32 +108,43 @@ internal class NotificationDataStore {
account: Account,
selector: (List<MessageReference>) -> List<MessageReference>
): RemoveNotificationsResult? {
val notificationData = getNotificationData(account)
var notificationData = getNotificationData(account)
if (notificationData.isEmpty()) return null
val removeMessageReferences = selector.invoke(notificationData.messageReferences)
if (removeMessageReferences.isEmpty()) return null
val operations = mutableListOf<NotificationStoreOperation>()
val newNotificationHolders = mutableListOf<NotificationHolder>()
val cancelNotificationIds = mutableListOf<Int>()
for (messageReference in removeMessageReferences) {
val notificationHolder = notificationData.activeNotifications.firstOrNull {
val activeMessageReferences = notificationData.activeNotifications.map { it.content.messageReference }.toSet()
val (removeActiveMessageReferences, removeInactiveMessageReferences) = removeMessageReferences
.partition { it in activeMessageReferences }
if (removeInactiveMessageReferences.isNotEmpty()) {
val inactiveMessageReferences = notificationData.inactiveNotifications
.map { it.content.messageReference }.toSet()
for (messageReference in removeInactiveMessageReferences) {
if (messageReference in inactiveMessageReferences) {
operations.add(NotificationStoreOperation.Remove(messageReference))
}
}
val removeMessageReferenceSet = removeInactiveMessageReferences.toSet()
notificationData = notificationData.copy(
inactiveNotifications = notificationData.inactiveNotifications
.filter { it.content.messageReference !in removeMessageReferenceSet }
)
}
for (messageReference in removeActiveMessageReferences) {
val notificationHolder = notificationData.activeNotifications.first {
it.content.messageReference == messageReference
}
if (notificationHolder == null) {
val inactiveNotificationHolder = notificationData.inactiveNotifications.firstOrNull {
it.content.messageReference == messageReference
} ?: continue
operations.add(NotificationStoreOperation.Remove(messageReference))
val newNotificationData = notificationData.copy(
inactiveNotifications = notificationData.inactiveNotifications - inactiveNotificationHolder
)
notificationDataMap[account.uuid] = newNotificationData
} else if (notificationData.inactiveNotifications.isNotEmpty()) {
if (notificationData.inactiveNotifications.isNotEmpty()) {
val newNotificationHolder = notificationData.inactiveNotifications.first()
.toNotificationHolder(notificationHolder.notificationId)
@ -148,29 +159,29 @@ internal class NotificationDataStore {
)
)
val newNotificationData = notificationData.copy(
notificationData = notificationData.copy(
activeNotifications = notificationData.activeNotifications - notificationHolder +
newNotificationHolder,
inactiveNotifications = notificationData.inactiveNotifications.drop(1)
)
notificationDataMap[account.uuid] = newNotificationData
} else {
cancelNotificationIds.add(notificationHolder.notificationId)
operations.add(NotificationStoreOperation.Remove(messageReference))
val newNotificationData = notificationData.copy(
notificationData = notificationData.copy(
activeNotifications = notificationData.activeNotifications - notificationHolder
)
notificationDataMap[account.uuid] = newNotificationData
}
}
notificationDataMap[account.uuid] = notificationData
return if (operations.isEmpty()) {
null
} else {
RemoveNotificationsResult(
notificationData = getNotificationData(account),
notificationData = notificationData,
notificationStoreOperations = operations,
notificationHolders = newNotificationHolders,
cancelNotificationIds = cancelNotificationIds

32
app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt
View file

@ -92,6 +92,38 @@ class NotificationDataStoreTest : RobolectricTest() {
}
}
@Test
fun `remove multiple notifications`() {
repeat(MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS + 1) { index ->
notificationDataStore.addNotification(account, createNotificationContent(index.toString()), TIMESTAMP)
}
val result = notificationDataStore.removeNotifications(account) { it.dropLast(1) }
assertNotNull(result) { removeResult ->
assertThat(removeResult.notificationData.newMessagesCount).isEqualTo(1)
assertThat(removeResult.cancelNotificationIds).hasSize(MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS)
}
}
@Test
fun `remove all notifications`() {
repeat(MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS + 1) { index ->
notificationDataStore.addNotification(account, createNotificationContent(index.toString()), TIMESTAMP)
}
val result = notificationDataStore.removeNotifications(account) { it }
assertNotNull(result) { removeResult ->
assertThat(removeResult.notificationData.newMessagesCount).isEqualTo(0)
assertThat(removeResult.notificationHolders).hasSize(0)
assertThat(removeResult.notificationStoreOperations).hasSize(MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS + 1)
for (notificationStoreOperation in removeResult.notificationStoreOperations) {
assertThat(notificationStoreOperation).isInstanceOf(NotificationStoreOperation.Remove::class.java)
}
}
}
@Test
fun testRemoveDoesNotLeakNotificationIds() {
for (i in 1..MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS + 1) {