Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-04 08:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed temporary target copy on messaged deleted

Browse Source
This commit is contained in:
M66B
2019-01-23 19:26:57 +00:00
parent b0c1747bbe
commit cb68ddb269
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@@ -1451,6 +1451,8 @@ public class ServiceSynchronize extends LifecycleService {
if (op.message != null)
message = db.message().getMessage(op.message);
JSONArray jargs = new JSONArray(op.args);
try {
if (message == null && !EntityOperation.SYNC.equals(op.name))
throw new MessageRemovedException();
@@ -1466,8 +1468,6 @@ public class ServiceSynchronize extends LifecycleService {
EntityOperation.SYNC.equals(op.name)))
throw new IllegalArgumentException(op.name + " without uid " + op.args);
JSONArray jargs = new JSONArray(op.args);
// Operations should use database transaction when needed
if (EntityOperation.SEEN.equals(op.name))
@@ -1538,9 +1538,18 @@ public class ServiceSynchronize extends LifecycleService {
// There is no use in repeating
db.operation().deleteOperation(op.id);
if (message != null &&
ex instanceof MessageRemovedException)
db.message().deleteMessage(message.id);
// Cleanup
if (message != null)
if (ex instanceof MessageRemovedException) {
db.message().deleteMessage(message.id);
// Delete temporary copy in target folder
if (EntityOperation.MOVE.equals(op.name) && jargs.length() > 1)
db.message().deleteMessage(jargs.getInt(1));
if (EntityOperation.ADD.equals(op.name) && jargs.length() > 0)
db.message().deleteMessage(jargs.getInt(0));
} else
db.message().setMessageUiHide(message.id, false);
continue;
} else if (ex instanceof MessagingException) {