Remove FORCE_SYNC flag

gtask_related_email
Alex Baker 5 years ago
parent ab142ba9d2
commit feecd7913e

@ -9,6 +9,4 @@ package com.todoroo.astrid.data;
public class SyncFlags {
public static final String GTASKS_SUPPRESS_SYNC = "gtasks_suppress_sync";
public static final String FORCE_SYNC = "force_sync";
}

@ -90,7 +90,6 @@ public class TaskMover {
&& caldavTask.getCalendar().equals(((CaldavFilter) selectedList).getUuid())) {
return;
}
task.putTransitory(SyncFlags.FORCE_SYNC, true);
if (googleTask != null) {
googleTaskChildren = googleTaskDao.getChildren(id);
googleTaskDao.markDeleted(now(), id);

@ -15,7 +15,6 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.SyncFlags;
import com.todoroo.astrid.data.Task;
import java.io.FileNotFoundException;
import java.io.IOException;

@ -60,16 +60,12 @@ public class AfterSaveWork extends InjectingWorker {
static Data getInputData(Task current, Task original) {
boolean suppress = current.checkTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC);
boolean force = current.checkTransitory(SyncFlags.FORCE_SYNC);
Builder builder =
new Builder()
.putLong(EXTRA_ID, current.getId())
.putBoolean(
EXTRA_PUSH_GTASKS, !suppress && (force || !current.googleTaskUpToDate(original)))
.putBoolean(
EXTRA_PUSH_CALDAV, !suppress && (force || !current.caldavUpToDate(original)))
.putBoolean(
EXTRA_SUPPRESS_REFRESH, current.checkTransitory(TRANS_SUPPRESS_REFRESH));
.putBoolean(EXTRA_PUSH_GTASKS, !suppress && !current.googleTaskUpToDate(original))
.putBoolean(EXTRA_PUSH_CALDAV, !suppress && !current.caldavUpToDate(original))
.putBoolean(EXTRA_SUPPRESS_REFRESH, current.checkTransitory(TRANS_SUPPRESS_REFRESH));
if (original != null) {
builder
.putLong(EXTRA_ORIG_COMPLETED, original.getCompletionDate())

Loading…
Cancel
Save