diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java index 016e951eb..58f95c8a5 100644 --- a/src/com/fsck/k9/controller/MessagingController.java +++ b/src/com/fsck/k9/controller/MessagingController.java @@ -175,10 +175,6 @@ public class MessagingController implements Runnable // Key is accountUuid:folderName:messageUid , value is unimportant private ConcurrentHashMap deletedUids = new ConcurrentHashMap(); - // Key is accountUuid:folderName , value is a long of the highest message UID ever emptied from Trash - private ConcurrentHashMap expungedUid = new ConcurrentHashMap(); - - private String createMessageKey(Account account, String folder, Message message) { return createMessageKey(account, folder, message.getUid()); @@ -189,11 +185,6 @@ public class MessagingController implements Runnable return account.getUuid() + ":" + folder + ":" + uid; } - private String createFolderKey(Account account, String folder) - { - return account.getUuid() + ":" + folder; - } - private void suppressMessage(Account account, String folder, Message message) { @@ -228,30 +219,10 @@ public class MessagingController implements Runnable { return true; } - Long expungedUidL = expungedUid.get(createFolderKey(account, folder)); - if (expungedUidL != null) - { - long expungedUid = expungedUidL; - String messageUidS = message.getUid(); - try - { - long messageUid = Long.parseLong(messageUidS); - if (messageUid <= expungedUid) - { - return false; - } - } - catch (NumberFormatException nfe) - { - // Nothing to do - } - } + return false; } - - - private MessagingController(Application application) { mApplication = application;