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

Revert "Permanently delete similar messages" 

This reverts commit 06cdd66ae2.
This commit is contained in:
M66B 2020-04-26 17:53:24 +02:00
parent da3c59cc05
commit 55f571de91
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/eu/faircode/email/EntityOperation.java
View File

@ -299,32 +299,10 @@ public class EntityOperation {
return; return;
} else if (DELETE.equals(name)) { } else if (DELETE.equals(name))
db.message().setMessageUiHide(message.id, true); db.message().setMessageUiHide(message.id, true);
// Delete Gmail corresponding archive message else if (ATTACHMENT.equals(name))
EntityFolder folder = db.folder().getFolder(message.folder);
if (folder != null && !EntityFolder.ARCHIVE.equals(folder.type)) {
boolean user = false;
boolean archive = false;
List<EntityMessage> similars = db.message().getMessagesBySimilarity(message.account, message.id, message.msgid);
for (EntityMessage similar : similars)
if (!similar.id.equals(message.id)) {
EntityFolder f = db.folder().getFolder(similar.folder);
if (f == null || EntityFolder.USER.equals(f.type))
user = true;
if (f != null && EntityFolder.ARCHIVE.equals(f.type))
archive = true;
}
if (archive && !user) {
for (EntityMessage similar : similars)
if (!similar.id.equals(message.id)) {
db.message().setMessageUiHide(similar.id, true);
queue(context, similar.account, similar.folder, similar.id, name, jargs);
}
}
}
} else if (ATTACHMENT.equals(name))
db.attachment().setProgress(jargs.getLong(0), 0); db.attachment().setProgress(jargs.getLong(0), 0);
queue(context, message.account, message.folder, message.id, name, jargs); queue(context, message.account, message.folder, message.id, name, jargs);