Fixed some bugs where metadata deletion date wasn't being respected for tags

astrid/plugin-src/com/todoroo/astrid/tags/TagService.java

@@ -149,8 +149,9 @@ public final class TagService {
             Criterion fullCriterion = Criterion.and(
                     Field.field("mtags." + Metadata.KEY.name).eq(TagMetadata.KEY),
                     Field.field("mtags." + TagMetadata.TAG_UUID.name).eq(remoteId),
+                    Field.field("mtags." + Metadata.DELETION_DATE.name).eq(0),
                     criterion);
-            return new QueryTemplate().join(Join.inner(Metadata.TABLE.as("mtags"), Task.REMOTE_ID.eq(Field.field("mtags." + TagMetadata.TASK_UUID))))
+            return new QueryTemplate().join(Join.inner(Metadata.TABLE.as("mtags"), Task.REMOTE_ID.eq(Field.field("mtags." + TagMetadata.TASK_UUID.name))))
                     .where(fullCriterion);
         }
 

astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java

@@ -733,7 +733,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
             model = taskService.fetchById(idParam, Task.PROPERTIES);
             if (model != null && model.containsNonNullValue(Task.REMOTE_ID)) {
                 remoteId = model.getValue(Task.REMOTE_ID);
-                model.clearValue(Task.REMOTE_ID); // Having this can screw up autosync
             }
         }
 

astrid/src/com/todoroo/astrid/activity/TaskListFragment.java

@@ -907,6 +907,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
 
         Criterion tagsJoinCriterion = Criterion.and(
                 Field.field(TAGS_METADATA_JOIN + "." + Metadata.KEY.name).eq(TagMetadata.KEY), //$NON-NLS-1$
+                Field.field(TAGS_METADATA_JOIN + "." + Metadata.DELETION_DATE.name).eq(0),
                 Task.ID.eq(Field.field(TAGS_METADATA_JOIN + "." + Metadata.TASK.name)),
                 Criterion.not(tagProperty.in(emergentTagIds)));
         if (tagName != null)

astrid/src/com/todoroo/astrid/service/TaskService.java

@@ -67,9 +67,6 @@ public class TaskService {
     private static final int COMPLETED_TASKS_FOR_ACTIVATION = 1;
     private static final String PREF_USER_ACTVATED = "user-activated"; //$NON-NLS-1$
 
-    @Autowired
-    private TagService tagService;
-
     @Autowired
     private TaskDao taskDao;
 
@@ -206,7 +203,7 @@ public class TaskService {
         taskDao.save(newTask);
 
         if (tagUuid > 0) {
-            tagService.createLink(task, tagName, tagUuid);
+            TagService.getInstance().createLink(task, tagName, tagUuid);
         }
         return newTask;
     }