mirror of https://github.com/M66B/FairEmail.git
Delete similar messages before adding a new one
This commit is contained in:
parent
6a96d8a075
commit
d9257de490
|
@ -380,6 +380,20 @@ class Core {
|
||||||
if (TextUtils.isEmpty(message.msgid))
|
if (TextUtils.isEmpty(message.msgid))
|
||||||
throw new IllegalArgumentException("Message ID missing");
|
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
|
// Get message
|
||||||
MimeMessage imessage;
|
MimeMessage imessage;
|
||||||
if (folder.id.equals(message.folder)) {
|
if (folder.id.equals(message.folder)) {
|
||||||
|
@ -452,23 +466,7 @@ class Core {
|
||||||
Log.i(folder.name + " appended id=" + message.id + " uid=" + uid);
|
Log.i(folder.name + " appended id=" + message.id + " uid=" + uid);
|
||||||
db.message().setMessageUid(message.id, uid);
|
db.message().setMessageUid(message.id, uid);
|
||||||
|
|
||||||
if (folder.id.equals(message.folder)) {
|
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
|
|
||||||
try {
|
try {
|
||||||
db.beginTransaction();
|
db.beginTransaction();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue