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

Move existing, delete removed

Browse Source
This commit is contained in:
M66B
2019-11-24 12:33:50 +01:00
parent 06720b8d4c
commit 52d2ad5364
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -435,9 +435,11 @@ class Core {
ex instanceof MessageRemovedIOException ||
ex.getCause() instanceof MessageRemovedException ||
ex.getCause() instanceof MessageRemovedIOException)) {
// Failsafe: retry batch
if (similar.size() > 0)
throw ex;
db.message().deleteMessage(message.id);
for (EntityMessage m : similar.values())
db.message().deleteMessage(m.id);
}
// Cleanup operations
@@ -788,14 +790,15 @@ class Core {
// Get source messages
Map<Message, EntityMessage> map = new HashMap<>();
for (EntityMessage message : messages)
if (message.uid != null)
try {
Message imessage = ifolder.getMessageByUID(message.uid);
if (imessage != null)
map.put(imessage, message);
} catch (MessagingException ex) {
Log.w(ex);
}
try {
Message imessage = ifolder.getMessageByUID(message.uid);
if (imessage == null)
throw new MessageRemovedException();
map.put(imessage, message);
} catch (MessageRemovedException ex) {
Log.w(ex);
db.message().deleteMessage(message.id);
}
// Some providers do not support the COPY operation for drafts
boolean draft = (EntityFolder.DRAFTS.equals(folder.type) || EntityFolder.DRAFTS.equals(target.type));