From f11052bb88e9d114d3947c891dace0ef6b75a979 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 3 May 2012 01:57:12 -0700
Subject: [PATCH] Respect tag deleted_at

---
 .../com/todoroo/astrid/actfm/sync/ActFmSyncService.java      | 3 +++
 astrid/plugin-src/com/todoroo/astrid/tags/TagService.java    | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
index 2e1ac2684..f71c8256d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@@ -1206,6 +1206,9 @@ public final class ActFmSyncService {
                 model.setValue(TagData.MEMBER_COUNT, members.length());
             }
 
+            if (json.has("deleted_at"))
+                model.setValue(TagData.DELETION_DATE, readDate(json, "deleted_at"));
+
             if(json.has("tasks"))
                 model.setValue(TagData.TASK_COUNT, json.getInt("tasks"));
         }
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
index cc9d2175c..e65dc142e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
@@ -297,7 +297,10 @@ public final class TagService {
                 tagData.readFromCursor(cursor);
                 String tagName = tagData.getValue(TagData.NAME).trim();
                 Tag tag = new Tag(tagData);
-                if(tagData.getValue(TagData.DELETION_DATE) > 0 && !tags.containsKey(tagName)) continue;
+                if(tagData.getValue(TagData.DELETION_DATE) > 0) {
+                    tags.remove(tagName);
+                    continue;
+                }
                 if(TextUtils.isEmpty(tag.tag))
                     continue;
                 tags.put(tagName, tag);