From 339e5cf344376720f1fac64a9362d4d8f479005b Mon Sep 17 00:00:00 2001 From: Tim Su Date: Sat, 11 Jun 2011 20:06:51 -0700 Subject: [PATCH] Fix for modified date getting written when details get written mistakenly --- api/src/com/todoroo/astrid/data/TaskApiDao.java | 1 - api/src/com/todoroo/astrid/sync/SyncMetadataService.java | 2 +- .../com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/api/src/com/todoroo/astrid/data/TaskApiDao.java b/api/src/com/todoroo/astrid/data/TaskApiDao.java index 2ad16339e..a00b4c19f 100644 --- a/api/src/com/todoroo/astrid/data/TaskApiDao.java +++ b/api/src/com/todoroo/astrid/data/TaskApiDao.java @@ -138,7 +138,6 @@ public class TaskApiDao extends ContentResolverDao { return true; if(values.containsKey(Task.DETAILS_DATE.name) && - values.containsKey(Task.DETAILS.name) && values.size() <= 3) return true; diff --git a/api/src/com/todoroo/astrid/sync/SyncMetadataService.java b/api/src/com/todoroo/astrid/sync/SyncMetadataService.java index 07eafd971..81c02b5cc 100644 --- a/api/src/com/todoroo/astrid/sync/SyncMetadataService.java +++ b/api/src/com/todoroo/astrid/sync/SyncMetadataService.java @@ -95,7 +95,7 @@ abstract public class SyncMetadataService { TodorooCursor tasks; long lastSyncDate = getUtilities().getLastSyncDate(); if(lastSyncDate == 0) - tasks = taskDao.query(Query.select(Task.ID).orderBy(Order.asc(Task.ID))); + tasks = taskDao.query(Query.select(Task.ID).where(Criterion.none)); else tasks = taskDao.query(Query.select(Task.ID).where(Task.MODIFICATION_DATE. gt(lastSyncDate)).orderBy(Order.asc(Task.ID))); diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java index fb9ed8638..89a22c63d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java @@ -212,7 +212,6 @@ public class GtasksSyncProvider extends SyncProvider { if(Constants.DEBUG) Log.e("gtasks-debug", "- -------- SYNC STARTED"); createdWithoutId = new ArrayList(); - try { GoogleTaskView taskView = taskService.getTaskView(); getActiveList(taskView);