Fixed a bug where deleted comments would still show up

astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java

@@ -416,6 +416,9 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                         activity.runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
+                                task = PluginServices.getTaskService().fetchById(task.getId(), Task.NOTES, Task.ID, Task.UUID, Task.TITLE, Task.HISTORY_FETCH_DATE, Task.USER_ACTIVITIES_PUSHED_AT, Task.ATTACHMENTS_PUSHED_AT);
+                                if (task == null)
+                                    return;
                                 setUpListAdapter();
                                 loadingText.setText(R.string.ENA_no_comments);
                                 loadingText.setVisibility(items.size() == 0 ? View.VISIBLE : View.GONE);

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

@@ -591,7 +591,7 @@ public class TaskService {
 
     private static Query queryForTask(Task task, String userTableAlias, Property<?>[] activityProperties, Property<?>[] userProperties) {
         Query result = Query.select(AndroidUtilities.addToArray(activityProperties, userProperties))
-                .where(Criterion.and(UserActivity.ACTION.eq(UserActivity.ACTION_TASK_COMMENT), UserActivity.TARGET_ID.eq(task.getUuid())));
+                .where(Criterion.and(UserActivity.ACTION.eq(UserActivity.ACTION_TASK_COMMENT), UserActivity.TARGET_ID.eq(task.getUuid()), UserActivity.DELETED_AT.eq(0)));
         if (!TextUtils.isEmpty(userTableAlias))
             result = result.join(Join.left(User.TABLE.as(userTableAlias), UserActivity.USER_UUID.eq(Field.field(userTableAlias + "." + User.UUID.name)))); //$NON-NLS-1$
         return result;