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

Skip redundant operations

Browse Source
This commit is contained in:
M66B
2019-09-17 16:36:19 +02:00
parent 012b6d1e7f
commit 1982c72f03
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,11 +177,32 @@ class Core {
// Operations should use database transaction when needed
// Squash operations
if (i + 1 < ops.size() && op.canSquash(ops.get(i + 1))) {
// Skip redundant operations
boolean skip = false;
for (int j = i + 1; j < ops.size(); j++) {
EntityOperation next = ops.get(j);
if (EntityOperation.ADD.equals(op.name)) {
if (Objects.equals(op.message, next.message) &&
(EntityOperation.ADD.equals(next.name) ||
EntityOperation.DELETE.equals(next.name))) {
skip = true;
break;
}
} else if (EntityOperation.FETCH.equals(op.name))
if (EntityOperation.FETCH.equals(next.name)) {
JSONArray jnext = new JSONArray(next.args);
if (jargs.getLong(0) == jnext.getLong(0)) {
skip = true;
break;
}
}
}
if (skip) {
Log.i(folder.name +
" squashing op=" + op.id + "/" + op.name +
" skipping op=" + op.id + "/" + op.name +
" msg=" + op.message + " args=" + op.args);
db.operation().deleteOperation(op.id);
continue;
}

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

@@ -341,21 +341,6 @@ public class EntityOperation {
Log.i("Queued subscribe=" + subscribe + " folder=" + folder);
}
boolean canSquash(EntityOperation next) throws JSONException {
if (Objects.equals(this.message, next.message) &&
ADD.equals(this.name) &&
(ADD.equals(next.name) || DELETE.equals(next.name)))
return true;
if (FETCH.equals(this.name) && FETCH.equals(next.name)) {
JSONArray jargs1 = new JSONArray(this.args);
JSONArray jargs2 = new JSONArray(next.args);
return (jargs1.optLong(0, -1) == jargs2.optLong(0, -2));
}
return false;
}
@Override
public boolean equals(Object obj) {
if (obj instanceof EntityOperation) {