Revert "Improved VANISHED handling"

This reverts commit a03cf0af30.
pull/215/head
M66B 3 months ago
parent 22ae5ed509
commit d7f55f2ac2

@ -3635,22 +3635,6 @@ public class IMAPFolder extends Folder implements UIDFolder, ResponseHandler {
// response // response
// "VANISHED" SP ["(EARLIER)"] SP known-uids // "VANISHED" SP ["(EARLIER)"] SP known-uids
ir.readAtomStringList(); // Skip EARLIER
String uids = ir.readAtom();
UIDSet[] uidset = UIDSet.parseUIDSets(uids);
List<Message> msgs = new ArrayList<>();
for (long uid : UIDSet.toArray(uidset)) {
Message m = uidTable.get(uid);
if (m != null && m.getMessageNumber() > 0) {
realTotal--;
messageCache.expungeMessage(m.getMessageNumber());
msgs.add(m);
}
}
if (!msgs.isEmpty() &&
doExpungeNotification && hasMessageCountListener)
notifyMessageRemovedListeners(true, msgs.toArray(new Message[0]));
/*
String[] s = ir.readAtomStringList(); String[] s = ir.readAtomStringList();
if (s == null) { // no (EARLIER) if (s == null) { // no (EARLIER)
String uids = ir.readAtom(); String uids = ir.readAtom();
@ -3667,7 +3651,7 @@ public class IMAPFolder extends Folder implements UIDFolder, ResponseHandler {
notifyMessageRemovedListeners(true, msgs); notifyMessageRemovedListeners(true, msgs);
} }
} // else if (EARLIER), ignore } // else if (EARLIER), ignore
*/
} else if (ir.keyEquals("FETCH")) { } else if (ir.keyEquals("FETCH")) {
assert ir instanceof FetchResponse : "!ir instanceof FetchResponse"; assert ir instanceof FetchResponse : "!ir instanceof FetchResponse";
Message msg = processFetchResponse((FetchResponse)ir); Message msg = processFetchResponse((FetchResponse)ir);

Loading…
Cancel
Save