From e8eae3738963cc5f14c8750197fea1423e8818e1 Mon Sep 17 00:00:00 2001 From: cketti Date: Fri, 27 Jan 2012 00:51:18 +0100 Subject: [PATCH] Reset unread/flagged count on "empty trash" --- src/com/fsck/k9/controller/MessagingController.java | 5 +++-- src/com/fsck/k9/mail/store/LocalStore.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java index b3b6b5462..389e6f2a4 100644 --- a/src/com/fsck/k9/controller/MessagingController.java +++ b/src/com/fsck/k9/controller/MessagingController.java @@ -3470,12 +3470,13 @@ public class MessagingController implements Runnable { putBackground("emptyTrash", listener, new Runnable() { @Override public void run() { - Folder localFolder = null; + LocalFolder localFolder = null; try { Store localStore = account.getLocalStore(); - localFolder = localStore.getFolder(account.getTrashFolderName()); + localFolder = (LocalFolder) localStore.getFolder(account.getTrashFolderName()); localFolder.open(OpenMode.READ_WRITE); localFolder.setFlags(new Flag[] { Flag.DELETED }, true); + localFolder.resetUnreadAndFlaggedCounts(); for (MessagingListener l : getListeners()) { l.emptyTrashCompleted(account); diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java index 38130c509..049f4222e 100644 --- a/src/com/fsck/k9/mail/store/LocalStore.java +++ b/src/com/fsck/k9/mail/store/LocalStore.java @@ -2619,7 +2619,7 @@ public class LocalStore extends Store implements Serializable { setVisibleLimit(mAccount.getDisplayCount()); } - private void resetUnreadAndFlaggedCounts() { + public void resetUnreadAndFlaggedCounts() { try { int newUnread = 0; int newFlagged = 0;