From 029bc86820c12eb8dd6f9a1947609dad22890b69 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 15 May 2019 12:00:10 -0500
Subject: [PATCH] Include deleted tasks when updating last sync

---
 .../todoroo/astrid/gtasks/sync/GtasksTaskContainer.java  | 9 ---------
 .../java/org/tasks/gtasks/GoogleTaskSynchronizer.java    | 5 ++++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java b/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
index b5bd9d394..34c4661b9 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
@@ -8,7 +8,6 @@ package com.todoroo.astrid.gtasks.sync;
 
 import static org.tasks.gtasks.GoogleTaskSynchronizer.mergeDates;
 
-import com.google.api.client.util.DateTime;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.gtasks.api.GtasksApiUtilities;
@@ -20,7 +19,6 @@ public class GtasksTaskContainer {
   public final Task task;
   public final ArrayList<GoogleTask> metadata;
   public final GoogleTask gtaskMetadata;
-  private final long updateTime;
 
   public GtasksTaskContainer(
       com.google.api.services.tasks.model.Task remoteTask,
@@ -42,13 +40,6 @@ public class GtasksTaskContainer {
 
     gtaskMetadata.setRemoteId(remoteTask.getId());
     gtaskMetadata.setListId(listId);
-
-    DateTime updated = remoteTask.getUpdated();
-    updateTime = updated == null ? 0 : updated.getValue();
-  }
-
-  public long getUpdateTime() {
-    return updateTime;
   }
 
   public void prepareForSaving() {
diff --git a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
index 4b56a4db3..3d16b554b 100644
--- a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
+++ b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
@@ -356,6 +356,10 @@ public class GoogleTaskSynchronizer {
         } else if (googleTask.getTask() > 0) {
           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 isHidden = gtask.getHidden();
         if ((isDeleted != null && isDeleted) || (isHidden != null && isHidden)) {
@@ -372,7 +376,6 @@ public class GoogleTaskSynchronizer {
         container.gtaskMetadata.setParent(localIdForGtasksId(gtask.getParent()));
         container.gtaskMetadata.setLastSync(DateUtilities.now() + 1000L);
         write(container);
-        lastSyncDate = Math.max(lastSyncDate, container.getUpdateTime());
       }
       list.setLastSync(lastSyncDate);
       googleTaskListDao.insertOrReplace(list);