mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-22 06:01:12 +00:00
Code Issues Releases Wiki Activity

Fix attachment disposition

Browse source
This commit is contained in:
M66B 2019-11-22 14:07:44 +01:00
parent 3747814289
commit a8cf904f7f
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/FragmentCompose.java
View file

@ -2532,15 +2532,27 @@ public class FragmentCompose extends FragmentBase {
} else if (ref != null &&
("reply".equals(action) || "reply_all".equals(action) ||
"forward".equals(action) || "editasnew".equals(action))) {
List<String> cid = new ArrayList<>();
for (Element img : document.select("img")) {
String src = img.attr("src");
if (src.startsWith("cid:"))
cid.add("<" + src.substring(4) + ">");
}
int sequence = 0;
List<EntityAttachment> attachments = db.attachment().getAttachments(ref.id);
for (EntityAttachment attachment : attachments)
if (attachment.encryption == null &&
("forward".equals(action) || "editasnew".equals(action) ||
(attachment.isInline() && attachment.isImage()))) {
(cid.contains(attachment.cid) ||
(attachment.isInline() && attachment.isImage())))) {
if (attachment.available) {
File source = attachment.getFile(context);
if (cid.contains(attachment.cid))
attachment.disposition = Part.INLINE;
attachment.id = null;
attachment.message = data.draft.id;
attachment.sequence = ++sequence;