msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Prepare operation partitioning

Browse Source
pull/172/head
M66B 6 years ago
parent 37d4b218b7
commit 544d4dfd61
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

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

@ -125,7 +125,7 @@ class Core {
static void processOperations( static void processOperations(
Context context, Context context,
EntityAccount account, EntityFolder folder, EntityAccount account, EntityFolder folder, List<TupleOperationEx> ops,
Store istore, Folder ifolder, Store istore, Folder ifolder,
State state) State state)
throws MessagingException, JSONException, IOException { throws MessagingException, JSONException, IOException {
@ -133,10 +133,9 @@ class Core {
Log.i(folder.name + " start process"); Log.i(folder.name + " start process");
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
List<TupleOperationEx> ops = db.operation().getOperations(folder.id);
List<Long> processed = new ArrayList<>(); List<Long> processed = new ArrayList<>();
Log.i(folder.name + " pending operations=" + ops.size()); Log.i(folder.name + " executing operations=" + ops.size());
for (int i = 0; i < ops.size() && state.isRunning() && state.isRecoverable(); i++) { for (int i = 0; i < ops.size() && state.isRunning() && state.isRecoverable(); i++) {
EntityOperation op = ops.get(i); EntityOperation op = ops.get(i);
if (processed.contains(op.id)) { if (processed.contains(op.id)) {

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

@ -1109,18 +1109,18 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
PowerManager.PARTIAL_WAKE_LOCK, BuildConfig.APPLICATION_ID + ":folder." + folder.id); PowerManager.PARTIAL_WAKE_LOCK, BuildConfig.APPLICATION_ID + ":folder." + folder.id);
@Override @Override
public void onChanged(final List<TupleOperationEx> operations) { public void onChanged(final List<TupleOperationEx> _operations) {
boolean process = false;
List<Long> ops = new ArrayList<>(); List<Long> ops = new ArrayList<>();
for (EntityOperation op : operations) { List<TupleOperationEx> operations = new ArrayList<>();
for (TupleOperationEx op : _operations) {
if (!handling.contains(op.id)) if (!handling.contains(op.id))
process = true; operations.add(op);
ops.add(op.id); ops.add(op.id);
} }
handling = ops; handling = ops;
if (handling.size() > 0 && process) { if (operations.size() > 0 ) {
Log.i(folder.name + " operations=" + operations.size() + Log.i(folder.name + " queuing operations=" + operations.size() +
" init=" + folder.initialize + " poll=" + folder.poll); " init=" + folder.initialize + " poll=" + folder.poll);
executor.submit(new Helper.PriorityRunnable(operations.get(0).priority) { executor.submit(new Helper.PriorityRunnable(operations.get(0).priority) {
@ -1156,6 +1156,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
Core.processOperations(ServiceSynchronize.this, Core.processOperations(ServiceSynchronize.this,
account, folder, account, folder,
operations,
iservice.getStore(), ifolder, iservice.getStore(), ifolder,
state); state);

Write Preview
Loading…
Cancel
Save