diff --git a/astrid/res/values/strings-updates.xml b/astrid/res/values/strings-updates.xml index 0bc0cc24e..bff6a83e0 100644 --- a/astrid/res/values/strings-updates.xml +++ b/astrid/res/values/strings-updates.xml @@ -8,6 +8,7 @@ %1$s wants to be friends with you %1$s has confirmed your friendship request %1$s created this task + %1$s created %2$s %1$s added %2$s to this list %1$s completed %2$s. Huzzah! %1$s un-completed %2$s. @@ -17,5 +18,7 @@ %1$s commented: %3$s %1$s Re: %2$s: %3$s %1$s Re: %2$s: %3$s + %1$s created this list + %1$s created the list %2$s diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java index fa36a2ac9..ccde95303 100644 --- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java @@ -61,6 +61,7 @@ public class UpdateAdapter extends CursorAdapter { private static final String UPDATE_TASK_ASSIGNED = "task_assigned"; //$NON-NLS-1$ public static final String UPDATE_TASK_COMMENT = "task_comment"; //$NON-NLS-1$ private static final String UPDATE_TAG_COMMENT = "tag_comment"; //$NON-NLS-1$ + private static final String UPDATE_TAG_CREATED = "tag_created"; //$NON-NLS-1$ public static final String FROM_TAG_VIEW = "from_tag"; //$NON-NLS-1$ public static final String FROM_TASK_VIEW = "from_task"; //$NON-NLS-1$ public static final String FROM_RECENT_ACTIVITY_VIEW = "from_recent_activity"; //$NON-NLS-1$ @@ -249,6 +250,8 @@ public class UpdateAdapter extends CursorAdapter { else if (actionCode.equals(UPDATE_TASK_CREATED)) { if (fromView.equals(FROM_TAG_VIEW)) commentResource = R.string.update_string_task_created_on_list; + else if (fromView.equals(FROM_RECENT_ACTIVITY_VIEW)) + commentResource = R.string.update_string_task_created_global; else commentResource = R.string.update_string_task_created; } @@ -280,6 +283,12 @@ public class UpdateAdapter extends CursorAdapter { commentResource = R.string.update_string_tag_comment; } + else if (actionCode.equals(UPDATE_TAG_CREATED)) { + if (fromView.equals(FROM_RECENT_ACTIVITY_VIEW)) + commentResource = R.string.update_string_tag_created_global; + else + commentResource = R.string.update_string_tag_created; + } if (commentResource == 0) { return Html.fromHtml(String.format("%s %s", userLink, action)); //$NON-NLS-1$