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

Add references when deleting attachments

This commit is contained in:
M66B 2023-06-27 21:35:13 +02:00
parent 43e7f9670d
commit 068034a5f9
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2111,7 +2111,11 @@ class Core {
throw new MessageRemovedException();
String msgid = EntityMessage.generateMessageId();
String ref = (TextUtils.isEmpty(message.references)
? message.msgid
: message.references + " " + message.msgid);
MimeMessage icopy = new MimeMessageEx((MimeMessage) imessage, msgid);
icopy.addHeader("References", MessageHelper.limitReferences(ref));
MessageHelper helper = new MessageHelper(icopy, context);
MessageHelper.MessageParts parts = helper.getMessageParts();
List<MessageHelper.AttachmentPart> aparts = parts.getAttachmentParts();

26
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@ -372,19 +372,8 @@ public class MessageHelper {
imessage.addHeader("Sensitivity", "Company-Confidential");
// References
if (message.references != null) {
// https://tools.ietf.org/html/rfc5322#section-2.1.1
// Each line of characters MUST be no more than 998 characters ... , excluding the CRLF.
String references = message.references;
int maxlen = MAX_HEADER_LENGTH - "References: ".length();
int sp = references.indexOf(' ');
while (references.length() > maxlen && sp > 0) {
Log.i("Dropping reference=" + references.substring(0, sp));
references = references.substring(sp);
sp = references.indexOf(' ');
}
imessage.addHeader("References", references);
}
if (message.references != null)
imessage.addHeader("References", limitReferences(message.references));
if (message.inreplyto != null)
imessage.addHeader("In-Reply-To", message.inreplyto);
@ -820,6 +809,17 @@ public class MessageHelper {
return new InternetAddress(email, name, StandardCharsets.UTF_8.name());
}
static String limitReferences(String references) {
int maxlen = MAX_HEADER_LENGTH - "References: ".length();
int sp = references.indexOf(' ');
while (references.length() > maxlen && sp > 0) {
Log.i("Dropping reference=" + references.substring(0, sp));
references = references.substring(sp);
sp = references.indexOf(' ');
}
return references;
}
static Pair<String, String> getExtra(String email, String extra) {
String name = null;
int comma = extra.indexOf(',');