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

Delete similar messages before adding a new one

This commit is contained in:
M66B 2019-03-25 16:26:37 +00:00
parent 6a96d8a075
commit d9257de490
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,6 +380,20 @@ class Core {
if (TextUtils.isEmpty(message.msgid))
throw new IllegalArgumentException("Message ID missing");
// Delete previous message(s) with same ID
if (folder.id.equals(message.folder)) {
Message[] ideletes = ifolder.search(new MessageIDTerm(message.msgid));
for (Message idelete : ideletes) {
long uid = ifolder.getUID(idelete);
Log.i(folder.name + " deleting previous uid=" + uid + " msgid=" + message.msgid);
try {
idelete.setFlag(Flags.Flag.DELETED, true);
} catch (MessageRemovedException ignored) {
}
}
ifolder.expunge();
}
// Get message
MimeMessage imessage;
if (folder.id.equals(message.folder)) {
@ -452,23 +466,7 @@ class Core {
Log.i(folder.name + " appended id=" + message.id + " uid=" + uid);
db.message().setMessageUid(message.id, uid);
if (folder.id.equals(message.folder)) {
// Delete previous message
Message[] ideletes = ifolder.search(new MessageIDTerm(message.msgid));
for (Message idelete : ideletes) {
long duid = ifolder.getUID(idelete);
if (duid == uid)
Log.i(folder.name + " append confirmed uid=" + duid);
else {
Log.i(folder.name + " deleting uid=" + duid + " msgid=" + message.msgid);
try {
idelete.setFlag(Flags.Flag.DELETED, true);
} catch (MessageRemovedException ignored) {
}
}
}
ifolder.expunge();
} else
if (!folder.id.equals(message.folder))
try {
db.beginTransaction();