Revert "Prioritize new operations"

This reverts commit ec5e43ffb5.
pull/172/head
M66B 5 years ago
parent ec5e43ffb5
commit 60a4f49477

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

Loading…
Cancel
Save