From bf955399b9b78e5d06030c5392c020e23f752b1e Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 1 Mar 2013 12:29:31 -0800
Subject: [PATCH] Fixed e801415 to do what it was supposed to do the first time

---
 .../sync/messages/TaskListMetadataChangesHappened.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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 f36140229..cfe419484 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
@@ -11,8 +11,11 @@ import com.todoroo.astrid.data.TaskListMetadataOutstanding;
 
 public class TaskListMetadataChangesHappened extends ChangesHappened<TaskListMetadata, TaskListMetadataOutstanding> {
 
+    private final Throwable throwable;
+
     public TaskListMetadataChangesHappened(long id, Class<TaskListMetadata> modelClass, TaskListMetadataDao modelDao, TaskListMetadataOutstandingDao outstandingDao) {
         super(id, modelClass, modelDao, outstandingDao);
+        throwable = new Throwable();
     }
 
     @Override
@@ -26,7 +29,7 @@ public class TaskListMetadataChangesHappened extends ChangesHappened<TaskListMet
             TaskListMetadataOutstanding oe = changes.get(i);
             String column = oe.getValue(TaskListMetadataOutstanding.COLUMN_STRING);
             if (TaskListMetadata.TASK_IDS.name.equals(column)) {
-                if (foundOrderChange) {
+                if (foundOrderChange || TaskListMetadata.taskIdsIsEmpty(oe.getValue(TaskListMetadataOutstanding.VALUE_STRING))) {
                     changes.remove(i);
                     removedChanges.add(oe.getId());
                 } else {
@@ -37,11 +40,6 @@ public class TaskListMetadataChangesHappened extends ChangesHappened<TaskListMet
                     changes.remove(i);
                     removedChanges.add(oe.getId());
                 }
-            } else if (TaskListMetadata.TASK_IDS.name.equals(column)) {
-                if (TaskListMetadata.taskIdsIsEmpty(oe.getValue(TaskListMetadataOutstanding.VALUE_STRING))) {
-                    changes.remove(i);
-                    removedChanges.add(oe.getId());
-                }
             }
         }