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

Prevent duplicate operation execution

This commit is contained in:
M66B 2019-01-29 15:57:05 +00:00
parent 7ddcc119e6
commit cdb84c72b3
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ public interface DaoOperation {
", id")
LiveData<List<TupleOperationEx>> liveOperations();
@Query("SELECT operation.* FROM operation" +
String GET_OPS_FOLDER = "SELECT operation.* FROM operation" +
" JOIN folder ON folder.id = operation.folder" +
" LEFT JOIN message ON message.id = operation.message" +
" LEFT JOIN account ON account.id = message.account" +
@ -57,7 +57,12 @@ public interface DaoOperation {
" CASE WHEN folder.account IS NULL THEN -1 ELSE 1 END" + // outbox
" ELSE 0" +
" END" +
", id")
", id";
@Query(GET_OPS_FOLDER)
List<EntityOperation> getOperations(long folder);
@Query(GET_OPS_FOLDER)
LiveData<List<EntityOperation>> liveOperations(long folder);
@Query("SELECT * FROM operation ORDER BY id")

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

@ -1229,7 +1229,7 @@ public class ServiceSynchronize extends LifecycleService {
db.folder().setFolderError(folder.id, null);
}
processOperations(account, folder, operations, isession, istore, ifolder, state);
processOperations(account, folder, isession, istore, ifolder, state);
} catch (Throwable ex) {
Log.e(folder.name, ex);
@ -1433,13 +1433,15 @@ public class ServiceSynchronize extends LifecycleService {
}
private void processOperations(
EntityAccount account, EntityFolder folder, List<EntityOperation> ops, Session isession,
IMAPStore istore, IMAPFolder ifolder, ServiceState state)
EntityAccount account, EntityFolder folder,
Session isession, IMAPStore istore, IMAPFolder ifolder,
ServiceState state)
throws MessagingException, JSONException, IOException {
try {
Log.i(folder.name + " start process");
DB db = DB.getInstance(this);
List<EntityOperation> ops = db.operation().getOperations(folder.id);
Log.i(folder.name + " pending operations=" + ops.size());
for (int i = 0; i < ops.size() && state.running(); i++) {
EntityOperation op = ops.get(i);
@ -3023,7 +3025,7 @@ public class ServiceSynchronize extends LifecycleService {
Log.i(outbox.name + " process");
db.folder().setFolderSyncState(outbox.id, "syncing");
processOperations(null, outbox, operations, null, null, null, state);
processOperations(null, outbox, null, null, null, state);
db.folder().setFolderError(outbox.id, null);
} catch (Throwable ex) {
Log.e(outbox.name, ex);