mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 04:35:57 +00:00
Code Issues Releases Wiki Activity

Compose compare attachments

Browse source
This commit is contained in:
M66B 2021-12-08 19:10:42 +01:00
parent 8d5a69cb88
commit 667affa583
2 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/eu/faircode/email/EntityAttachment.java
View file

@ -32,6 +32,7 @@ import androidx.room.PrimaryKey;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
@ -234,6 +235,33 @@ public class EntityAttachment {
return type;
}
public static boolean equals(List<EntityAttachment> a1, List<EntityAttachment> a2) {
if (a1 == null || a2 == null)
return false;
List<EntityAttachment> list = new ArrayList<>();
for (EntityAttachment a : a1)
if (a.available && !a.isEncryption())
list.add(a);
for (EntityAttachment a : a2)
if (a.available && !a.isEncryption()) {
boolean found = false;
for (EntityAttachment l : list)
if (Objects.equals(a.sequence, l.sequence) &&
Objects.equals(a.subsequence, l.subsequence)) {
list.remove(l);
found = true;
break;
}
if (!found)
return false;
}
return (list.size() == 0);
}
@Override
public boolean equals(Object obj) {
if (obj instanceof EntityAttachment) {

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

@ -286,7 +286,7 @@ public class FragmentCompose extends FragmentBase {
private State state = State.NONE;
private boolean show_images = false;
private Boolean last_plain_only = null;
private int last_available = 0; // attachments
private List<EntityAttachment> last_attachments = null;
private boolean saved = false;
private String subject = null;
@ -5040,16 +5040,12 @@ public class FragmentCompose extends FragmentBase {
}
last_plain_only = data.draft.plain_only;
last_attachments = db.attachment().getAttachments(data.draft.id);
List<EntityAttachment> attachments = db.attachment().getAttachments(data.draft.id);
for (EntityAttachment attachment : attachments)
if (attachment.available) {
if (!attachment.isEncryption())
last_available++;
} else {
if (attachment.progress == null)
if (last_attachments != null)
for (EntityAttachment attachment : last_attachments)
if (!attachment.available && attachment.progress == null)
EntityOperation.queue(context, data.draft, EntityOperation.ATTACHMENT, attachment.id);
}
db.setTransactionSuccessful();
} finally {
@ -5543,14 +5539,11 @@ public class FragmentCompose extends FragmentBase {
}
}
int available = 0;
List<Integer> eparts = new ArrayList<>();
for (EntityAttachment attachment : attachments)
if (attachment.available)
if (attachment.isEncryption())
eparts.add(attachment.encryption);
else
available++;
if (EntityMessage.PGP_SIGNONLY.equals(draft.ui_encrypt)) {
if (!eparts.contains(EntityAttachment.PGP_KEY) ||
@ -5580,11 +5573,11 @@ public class FragmentCompose extends FragmentBase {
!Objects.equals(draft.subject, subject) ||
!draft.signature.equals(signature) ||
!Objects.equals(last_plain_only, draft.plain_only) ||
last_available != available)
!EntityAttachment.equals(last_attachments, attachments))
dirty = true;
last_plain_only = draft.plain_only;
last_available = available;
last_attachments = attachments;
if (dirty) {
// Update draft