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

Replace delete attachments by place holder

This commit is contained in:
M66B 2023-06-26 13:59:42 +02:00
parent faa4c89dcd
commit 8b7c882fdb
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/eu/faircode/email/Core.java
View File

@ -109,6 +109,7 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import javax.mail.Address;
import javax.mail.BodyPart;
import javax.mail.FetchProfile;
import javax.mail.Flags;
import javax.mail.Folder;
@ -126,6 +127,7 @@ import javax.mail.StoreClosedException;
import javax.mail.UIDFolder;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.search.AndTerm;
import javax.mail.search.ComparisonTerm;
@ -2139,7 +2141,25 @@ class Core {
for (int i = 0; i < multipart.getCount(); i++) {
Part child = multipart.getBodyPart(i);
if (child == attachment) {
String fileName = child.getFileName();
String contentType = child.getContentType();
String disposition = child.getDisposition();
if (fileName != null && !fileName.startsWith("deleted"))
fileName = "deleted" + (TextUtils.isEmpty(fileName) ? "" : "_" + fileName);
if (TextUtils.isEmpty(contentType))
contentType = "application/octet-stream";
if (TextUtils.isEmpty(disposition))
disposition = Part.ATTACHMENT;
multipart.removeBodyPart(i);
BodyPart placeholderPart = new MimeBodyPart();
placeholderPart.setContent("", contentType);
placeholderPart.setFileName(fileName);
placeholderPart.setDisposition(disposition);
multipart.addBodyPart(placeholderPart);
deleted = true;
} else {
if (deletePart(child, attachment))