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

Revert "Prioritize new operations" 

This reverts commit ec5e43ffb5.
This commit is contained in:
M66B 2020-01-25 08:23:38 +01:00
parent ec5e43ffb5
commit 60a4f49477
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,13 +133,17 @@ class Core {
Log.i(folder.name + " start process");
DB db = DB.getInstance(context);
while (state.isRunning() && state.isRecoverable()) {
List<EntityOperation> ops = db.operation().getOperations(folder.id);
Log.i(folder.name + " pending operations=" + ops.size());
if (ops.size() == 0)
break;
List<EntityOperation> ops = db.operation().getOperations(folder.id);
List<Long> processed = new ArrayList<>();
Log.i(folder.name + " pending operations=" + ops.size());
for (int i = 0; i < ops.size() && state.isRunning() && state.isRecoverable(); i++) {
EntityOperation op = ops.get(i);
if (processed.contains(op.id)) {
Log.i(folder.name + " already processed op=" + op.id + "/" + op.name);
continue;
}
EntityOperation op = ops.get(0);
try {
Log.i(folder.name +
" start op=" + op.id + "/" + op.name +
@ -166,7 +170,7 @@ class Core {
// Process similar operations
boolean skip = false;
for (int j = 1; j < ops.size(); j++) {
for (int j = i + 1; j < ops.size(); j++) {
EntityOperation next = ops.get(j);
switch (op.name) {
@ -194,8 +198,10 @@ class Core {
// Same target
if (jargs.getLong(0) == jnext.getLong(0)) {
EntityMessage m = db.message().getMessage(next.message);
if (m != null && m.uid != null)
if (m != null && m.uid != null) {
processed.add(next.id);
similar.put(next, m);
}
}
}
break;