From 4fb86211b5f61733bfe221861d26a835d0eb3a60 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Thu, 28 Feb 2013 19:05:54 -0800 Subject: [PATCH] Don't send empty task list metadata id changes --- .../sync/messages/TaskListMetadataChangesHappened.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java index bc512f24d..6e0f63b09 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java @@ -5,6 +5,7 @@ import java.util.Set; import com.todoroo.astrid.dao.TaskListMetadataDao; import com.todoroo.astrid.dao.TaskListMetadataOutstandingDao; +import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.data.TaskListMetadataOutstanding; @@ -23,13 +24,19 @@ public class TaskListMetadataChangesHappened extends ChangesHappened= 0; i--) { TaskListMetadataOutstanding oe = changes.get(i); - if (TaskListMetadata.TASK_IDS.name.equals(oe.getValue(TaskListMetadataOutstanding.COLUMN_STRING))) { + String column = oe.getValue(TaskListMetadataOutstanding.COLUMN_STRING); + if (TaskListMetadata.TASK_IDS.name.equals(column)) { if (foundOrderChange) { changes.remove(i); removedChanges.add(oe.getId()); } else { foundOrderChange = true; } + } else if (TaskListMetadata.FILTER.name.equals(column) || TaskListMetadata.TAG_UUID.equals(column)) { + if (RemoteModel.isUuidEmpty(oe.getValue(TaskListMetadataOutstanding.VALUE_STRING))) { + changes.remove(i); + removedChanges.add(oe.getId()); + } } }