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

Update message content on downloading EML files

This commit is contained in:
M66B 2020-08-07 14:28:03 +02:00
parent cc237f3948
commit 011b2884e0
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -1464,25 +1464,32 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
db.attachment().liveAttachments(message.id).observe(cowner, new Observer<List<EntityAttachment>>() { db.attachment().liveAttachments(message.id).observe(cowner, new Observer<List<EntityAttachment>>() {
@Override @Override
public void onChanged(@Nullable List<EntityAttachment> attachments) { public void onChanged(@Nullable List<EntityAttachment> attachments) {
boolean show_images = properties.getValue("images", message.id);
boolean inline = prefs.getBoolean("inline_images", false);
if (show_images || inline) {
int inlineImages = 0; int inlineImages = 0;
int embeddedMessages = 0;
if (attachments != null) if (attachments != null)
for (EntityAttachment attachment : attachments) for (EntityAttachment attachment : attachments)
if (attachment.available && attachment.isInline() && attachment.isImage()) if (attachment.available)
if (attachment.isInline() && attachment.isImage())
inlineImages++; inlineImages++;
else if ("message/rfc822".equals(attachment.type))
embeddedMessages++;
int lastInlineImages = 0; int lastInlineImages = 0;
int lastEmbeddedMessages = 0;
List<EntityAttachment> lastAttachments = properties.getAttachments(message.id); List<EntityAttachment> lastAttachments = properties.getAttachments(message.id);
if (lastAttachments != null) if (lastAttachments != null)
for (EntityAttachment attachment : lastAttachments) for (EntityAttachment attachment : lastAttachments)
if (attachment.available && attachment.isInline() && attachment.isImage()) if (attachment.available)
if (attachment.isInline() && attachment.isImage())
lastInlineImages++; lastInlineImages++;
else if ("message/rfc822".equals(attachment.type))
lastEmbeddedMessages++;
if (inlineImages > lastInlineImages) boolean show_images = properties.getValue("images", message.id);
boolean inline = prefs.getBoolean("inline_images", false);
if (embeddedMessages > lastEmbeddedMessages ||
(inlineImages > lastInlineImages && (show_images || inline)))
bindBody(message, false); bindBody(message, false);
}
bindAttachments(message, attachments); bindAttachments(message, attachments);
} }