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

Mark all messages as "not new" when summary notification is dismissed

Browse source
This commit is contained in:
cketti 2021-12-11 17:59:31 +01:00
parent a8937a2a2d
commit fd920971b8
6 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/core/src/main/java/com/fsck/k9/controller/MessagingController.java
View file

@ -2407,7 +2407,7 @@ public class MessagingController {
clearFetchingMailNotification(account);
if (getUnreadMessageCount(account) == 0) {
notificationController.clearNewMailNotifications(account);
notificationController.clearNewMailNotifications(account, false);
}
}
}
@ -2493,7 +2493,7 @@ public class MessagingController {
}
public void deleteAccount(Account account) {
notificationController.clearNewMailNotifications(account);
notificationController.clearNewMailNotifications(account, false);
memorizingMessagingListener.removeAccount(account);
}
@ -2549,8 +2549,14 @@ public class MessagingController {
}
}
public void removeNotificationsForAccount(Account account) {
put("removeNotificationsForAccount", null, () -> {
notificationController.clearNewMailNotifications(account, false);
});
}
public void cancelNotificationsForAccount(Account account) {
notificationController.clearNewMailNotifications(account);
notificationController.clearNewMailNotifications(account, true);
}
public void cancelNotificationForMessage(Account account, MessageReference messageReference) {

4
app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt
View file

@ -38,8 +38,8 @@ internal class NewMailNotificationController(
}
}
fun clearNewMailNotifications(account: Account) {
val cancelNotificationIds = newMailNotificationManager.clearNewMailNotifications(account)
fun clearNewMailNotifications(account: Account, clearNewMessageState: Boolean) {
val cancelNotificationIds = newMailNotificationManager.clearNewMailNotifications(account, clearNewMessageState)
cancelNotifications(cancelNotificationIds)
}

4
app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt
View file

@ -100,8 +100,8 @@ internal class NewMailNotificationManager(
)
}
fun clearNewMailNotifications(account: Account): List<Int> {
notificationRepository.clearNotifications(account)
fun clearNewMailNotifications(account: Account, clearNewMessageState: Boolean): List<Int> {
notificationRepository.clearNotifications(account, clearNewMessageState)
return NotificationIds.getAllMessageNotificationIds(account)
}

4
app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt
View file

@ -68,7 +68,7 @@ class NotificationController internal constructor(
newMailNotificationController.removeNewMailNotification(account, messageReference)
}
fun clearNewMailNotifications(account: Account) {
newMailNotificationController.clearNewMailNotifications(account)
fun clearNewMailNotifications(account: Account, clearNewMessageState: Boolean) {
newMailNotificationController.clearNewMailNotifications(account, clearNewMessageState)
}
}

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

@ -51,9 +51,12 @@ internal class NotificationRepository(
}
@Synchronized
fun clearNotifications(account: Account) {
return notificationDataStore.clearNotifications(account).also {
clearNotificationStore(account)
fun clearNotifications(account: Account, clearNewMessageState: Boolean) {
notificationDataStore.clearNotifications(account)
clearNotificationStore(account)
if (clearNewMessageState) {
clearNewMessageState(account)
}
}
@ -90,6 +93,11 @@ internal class NotificationRepository(
}
}
private fun clearNewMessageState(account: Account) {
val messageStore = messageStoreManager.getMessageStore(account)
messageStore.clearNewMessageState()
}
private fun clearNotificationStore(account: Account) {
val notificationStore = notificationStoreProvider.getNotificationStore(account)
notificationStore.clearNotifications()

3
app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt
View file

@ -476,7 +476,8 @@ class MessageListFragment :
messagingController.addListener(activityListener)
for (account in localSearch.getAccounts(preferences)) {
messagingController.cancelNotificationsForAccount(account)
// TODO: Only remove notifications for messages in the currently displayed message list
messagingController.removeNotificationsForAccount(account)
}
updateTitle()