mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Workaround expunged messages without deleted flag" 

This reverts commit 22c3f06fb0.
This commit is contained in:
M66B 2020-07-25 13:21:35 +02:00
parent 5f14916851
commit 31b31aca47
2 changed files with 0 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/com/sun/mail/imap/IMAPMessage.java
View File

@ -1697,28 +1697,4 @@ public class IMAPMessage extends MimeMessage implements ReadableMime {
Session _getSession() {
return session;
}
@Override
public boolean isExpunged() {
if (super.isExpunged())
return true;
// Workaround expunged messages without deleted flag
if (size == 0 &&
receivedDate != null &&
receivedDate.getTime() == 0 &&
envelope != null &&
envelope.date == null &&
envelope.subject == null &&
envelope.from == null &&
envelope.sender == null &&
envelope.replyTo == null &&
envelope.to == null &&
envelope.cc == null &&
envelope.inReplyTo == null &&
envelope.messageId == null)
return true;
return false;
}
}

33
patches/JavaMail.patch
View File

@ -42,36 +42,3 @@ index 866f17737..929e82d33 100644
/**
* Set the user name to be used with the PROXYAUTH command.
* The PROXYAUTH user name can also be set using the
diff --git a/app/src/main/java/com/sun/mail/imap/IMAPMessage.java b/app/src/main/java/com/sun/mail/imap/IMAPMessage.java
index 453479d98..29433351f 100644
--- a/app/src/main/java/com/sun/mail/imap/IMAPMessage.java
+++ b/app/src/main/java/com/sun/mail/imap/IMAPMessage.java
@@ -1697,4 +1697,28 @@ public class IMAPMessage extends MimeMessage implements ReadableMime {
Session _getSession() {
return session;
}
+
+ @Override
+ public boolean isExpunged() {
+ if (super.isExpunged())
+ return true;
+
+ // Workaround expunged messages without deleted flag
+ if (size == 0 &&
+ receivedDate != null &&
+ receivedDate.getTime() == 0 &&
+ envelope != null &&
+ envelope.date == null &&
+ envelope.subject == null &&
+ envelope.from == null &&
+ envelope.sender == null &&
+ envelope.replyTo == null &&
+ envelope.to == null &&
+ envelope.cc == null &&
+ envelope.inReplyTo == null &&
+ envelope.messageId == null)
+ return true;
+
+ return false;
+ }
}