Include deleted tasks when updating last sync

pull/820/head
Alex Baker 7 years ago
parent c3bfa4e93b
commit 029bc86820

@ -8,7 +8,6 @@ package com.todoroo.astrid.gtasks.sync;
import static org.tasks.gtasks.GoogleTaskSynchronizer.mergeDates; import static org.tasks.gtasks.GoogleTaskSynchronizer.mergeDates;
import com.google.api.client.util.DateTime;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gtasks.api.GtasksApiUtilities; import com.todoroo.astrid.gtasks.api.GtasksApiUtilities;
@ -20,7 +19,6 @@ public class GtasksTaskContainer {
public final Task task; public final Task task;
public final ArrayList<GoogleTask> metadata; public final ArrayList<GoogleTask> metadata;
public final GoogleTask gtaskMetadata; public final GoogleTask gtaskMetadata;
private final long updateTime;
public GtasksTaskContainer( public GtasksTaskContainer(
com.google.api.services.tasks.model.Task remoteTask, com.google.api.services.tasks.model.Task remoteTask,
@ -42,13 +40,6 @@ public class GtasksTaskContainer {
gtaskMetadata.setRemoteId(remoteTask.getId()); gtaskMetadata.setRemoteId(remoteTask.getId());
gtaskMetadata.setListId(listId); gtaskMetadata.setListId(listId);
DateTime updated = remoteTask.getUpdated();
updateTime = updated == null ? 0 : updated.getValue();
}
public long getUpdateTime() {
return updateTime;
} }
public void prepareForSaving() { public void prepareForSaving() {

@ -356,6 +356,10 @@ public class GoogleTaskSynchronizer {
} else if (googleTask.getTask() > 0) { } else if (googleTask.getTask() > 0) {
task = taskDao.fetch(googleTask.getTask()); task = taskDao.fetch(googleTask.getTask());
} }
com.google.api.client.util.DateTime updated = gtask.getUpdated();
if (updated != null) {
lastSyncDate = Math.max(lastSyncDate, updated.getValue());
}
Boolean isDeleted = gtask.getDeleted(); Boolean isDeleted = gtask.getDeleted();
Boolean isHidden = gtask.getHidden(); Boolean isHidden = gtask.getHidden();
if ((isDeleted != null && isDeleted) || (isHidden != null && isHidden)) { if ((isDeleted != null && isDeleted) || (isHidden != null && isHidden)) {
@ -372,7 +376,6 @@ public class GoogleTaskSynchronizer {
container.gtaskMetadata.setParent(localIdForGtasksId(gtask.getParent())); container.gtaskMetadata.setParent(localIdForGtasksId(gtask.getParent()));
container.gtaskMetadata.setLastSync(DateUtilities.now() + 1000L); container.gtaskMetadata.setLastSync(DateUtilities.now() + 1000L);
write(container); write(container);
lastSyncDate = Math.max(lastSyncDate, container.getUpdateTime());
} }
list.setLastSync(lastSyncDate); list.setLastSync(lastSyncDate);
googleTaskListDao.insertOrReplace(list); googleTaskListDao.insertOrReplace(list);

Loading…
Cancel
Save