From a974f7188c7de1b13456e8ea002db1ba200ad1c9 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sun, 16 Jan 2011 21:33:46 +0000 Subject: [PATCH] Simplify folder-skip logic when cleaning out folders deleted on the server. (Note that we no longer delete the archive folder locally, even if it's killed upstream) --- src/com/fsck/k9/controller/MessagingController.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java index ee8ba3ffd..abee62a64 100644 --- a/src/com/fsck/k9/controller/MessagingController.java +++ b/src/com/fsck/k9/controller/MessagingController.java @@ -551,16 +551,7 @@ public class MessagingController implements Runnable for (Folder localFolder : localFolders) { String localFolderName = localFolder.getName(); - if (localFolderName.equalsIgnoreCase(K9.INBOX) || - localFolderName.equals(account.getTrashFolderName()) || - localFolderName.equals(account.getOutboxFolderName()) || - localFolderName.equals(account.getDraftsFolderName()) || - localFolderName.equals(account.getSentFolderName()) || - localFolderName.equals(account.getErrorFolderName())) - { - continue; - } - if (!remoteFolderNames.contains(localFolder.getName())) + if (!account.isSpecialFolder(localFolderName) && !remoteFolderNames.contains(localFolderName)) { localFolder.delete(false); }