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

Remove rows from 'notifications' table when clearing notifications

Browse source
This commit is contained in:
cketti 2022-02-10 01:49:53 +01:00
parent c61b097f8b
commit 4d0bbd1e8a
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt
View file

@ -39,7 +39,11 @@ internal class NotificationRepository(
@Synchronized
fun addNotification(account: Account, content: NotificationContent, timestamp: Long): AddNotificationResult {
return notificationDataStore.addNotification(account, content, timestamp).also { result ->
persistNotificationDataStoreChanges(account, result.notificationStoreOperations)
persistNotificationDataStoreChanges(
account = account,
operations = result.notificationStoreOperations,
updateNewMessageState = true
)
}
}
@ -50,9 +54,11 @@ internal class NotificationRepository(
selector: (List<MessageReference>) -> List<MessageReference>
): RemoveNotificationsResult? {
return notificationDataStore.removeNotifications(account, selector)?.also { result ->
if (clearNewMessageState) {
persistNotificationDataStoreChanges(account, result.notificationStoreOperations)
}
persistNotificationDataStoreChanges(
account = account,
operations = result.notificationStoreOperations,
updateNewMessageState = clearNewMessageState
)
}
}
@ -66,11 +72,17 @@ internal class NotificationRepository(
}
}
private fun persistNotificationDataStoreChanges(account: Account, operations: List<NotificationStoreOperation>) {
private fun persistNotificationDataStoreChanges(
account: Account,
operations: List<NotificationStoreOperation>,
updateNewMessageState: Boolean
) {
val notificationStore = notificationStoreProvider.getNotificationStore(account)
notificationStore.persistNotificationChanges(operations)
setNewMessageState(account, operations)
if (updateNewMessageState) {
setNewMessageState(account, operations)
}
}
private fun setNewMessageState(account: Account, operations: List<NotificationStoreOperation>) {