Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-11 03:24:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check for images only on reply

Browse Source
This commit is contained in:
M66B
2019-05-06 07:36:44 +02:00
parent c5a569afe3
commit feaea0416e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -989,7 +989,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
List<EntityAttachment> a = new ArrayList<>();
for (EntityAttachment attachment : attachments) {
boolean inline = (TextUtils.isEmpty(attachment.name) ||
(attachment.isInline() && attachment.type.startsWith("image/")));
(attachment.isInline() && attachment.isImage()));
if (inline)
has_inline = true;
if (attachment.progress == null && !attachment.available)
@@ -1026,7 +1026,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
List<EntityAttachment> images = new ArrayList<>();
for (EntityAttachment attachment : attachments)
if (!attachment.isInline() && attachment.type.startsWith("image/"))
if (!attachment.isInline() && attachment.isImage())
images.add(attachment);
adapterImage.set(images);
@@ -2955,7 +2955,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
long id = args.getLong("id");
List<EntityAttachment> attachments = DB.getInstance(context).attachment().getAttachments(id);
for (EntityAttachment attachment : attachments)
if (!attachment.available && attachment.isInline())
if (!attachment.available && attachment.isInline() && attachment.isImage())
return false;
return true;
}

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

@@ -76,6 +76,10 @@ public class EntityAttachment {
return (disposition != null && disposition.equalsIgnoreCase(Part.INLINE));
}
boolean isImage() {
return type.startsWith("image/");
}
File getFile(Context context) {
File dir = new File(context.getFilesDir(), "attachments");
if (!dir.exists())