Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-29 21:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent deleting executing operations

Browse Source
This commit is contained in:
M66B
2020-07-05 08:04:18 +02:00
parent 8d3c057fea
commit 3d13ea3773
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/DaoOperation.java
View File

@@ -150,6 +150,8 @@ public interface DaoOperation {
@Query("DELETE FROM operation WHERE id = :id")
int deleteOperation(long id);
@Query("DELETE FROM operation WHERE folder = :folder")
int deleteOperations(long folder);
@Query("DELETE FROM operation" +
" WHERE folder = :folder" +
" AND state <> 'executing'")
int deletePendingOperations(long folder);
}

2
app/src/main/java/eu/faircode/email/ServiceSend.java
View File

@@ -414,7 +414,7 @@ public class ServiceSend extends ServiceBase {
db.folder().setFolderError(outbox.id, null);
// Delete pending operations
db.operation().deleteOperations(outbox.id);
db.operation().deletePendingOperations(outbox.id);
// Requeue operations
NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);