JavaMail: fixed EXPUNGE/VANISHED interaction

4 months ago · 97332375ac
parent e03d44ddf3
commit 97332375ac
1 changed files with 7 additions and 4 deletions
--- a/app/src/main/java/com/sun/mail/imap/IMAPFolder.java
+++ b/app/src/main/java/com/sun/mail/imap/IMAPFolder.java
@ -3643,11 +3643,14 @@ public class IMAPFolder extends Folder implements UIDFolder, ResponseHandler {
 		if (uidset != null) {
 			List<Message> msgs = new ArrayList<>();
 			for (long uid : UIDSet.toArray(uidset)) {
-				Message m = uidTable.get(uid);
+				IMAPMessage m = uidTable.get(uid);
 				if (m != null && m.getMessageNumber() > 0) {
+					if (doExpungeNotification) {
 						realTotal--;
 						messageCache.expungeMessage(m.getMessageNumber());
 						msgs.add(m);
+					} else
+						m.setExpunged(true);
 				}
 			}
 			if (!msgs.isEmpty() &&