From 0ff8772a9406b5fdf664bdd55160003a6b8880fa Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 30 Jan 2013 15:50:43 -0800
Subject: [PATCH] Fixed some typos

---
 api/src/com/todoroo/astrid/data/UserActivity.java             | 2 +-
 .../com/todoroo/astrid/actfm/sync/ActFmSyncThread.java        | 2 +-
 .../com/todoroo/astrid/actfm/sync/messages/NameMaps.java      | 2 +-
 astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/src/com/todoroo/astrid/data/UserActivity.java b/api/src/com/todoroo/astrid/data/UserActivity.java
index cd5b6dd7f..3f33232a4 100644
--- a/api/src/com/todoroo/astrid/data/UserActivity.java
+++ b/api/src/com/todoroo/astrid/data/UserActivity.java
@@ -70,7 +70,7 @@ public class UserActivity extends RemoteModel {
 
     /** Deleted at */
     public static final LongProperty DELETED_AT = new LongProperty(
-            TABLE, "created_at", Property.PROP_FLAG_DATE);
+            TABLE, "deleted_at", Property.PROP_FLAG_DATE);
 
     public UserActivity() {
         super();
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
index 2035fa2a4..d8edea2be 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
@@ -174,7 +174,6 @@ public class ActFmSyncThread {
                     Flags.checkAndClear(Flags.BG_SYNC);
                     messageBatch.add(BriefMe.instantiateBriefMeForClass(Task.class, NameMaps.PUSHED_AT_TASKS));
                     messageBatch.add(BriefMe.instantiateBriefMeForClass(TagData.class, NameMaps.PUSHED_AT_TAGS));
-                    messageBatch.add(BriefMe.instantiateBriefMeForClass(UserActivity.class, NameMaps.PUSHED_AT_ACTIVITY));
                 }
 
                 if (!messageBatch.isEmpty() && checkForToken()) {
@@ -253,6 +252,7 @@ public class ActFmSyncThread {
     private void repopulateQueueFromOutstandingTables() {
         constructChangesHappenedFromOutstandingTable(Task.class, taskDao, taskOutstandingDao);
         constructChangesHappenedFromOutstandingTable(TagData.class, tagDataDao, tagOutstandingDao);
+        constructChangesHappenedFromOutstandingTable(UserActivity.class, userActivityDao, userActivityOutstandingDao);
     }
 
     private <T extends RemoteModel, OE extends OutstandingEntry<T>> void constructChangesHappenedFromOutstandingTable(Class<T> modelClass, RemoteModelDao<T> modelDao, OutstandingEntryDao<OE> oustandingDao) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java
index 203998dce..b27fe24ef 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java
@@ -26,7 +26,7 @@ public class NameMaps {
     public static final String TABLE_ID_TASKS = "tasks";
     public static final String TABLE_ID_TAGS = "tags";
     public static final String TABLE_ID_USERS = "users";
-    public static final String TABLE_ID_USER_ACTIVITY = "user_activity";
+    public static final String TABLE_ID_USER_ACTIVITY = "user_activities";
     public static final String TABLE_ID_PUSHED_AT = "pushed_at";
 
     public static final String PUSHED_AT_TASKS = TABLE_ID_PUSHED_AT + "_" + TABLE_ID_TASKS;
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java b/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java
index 9ec523ee5..22129aa86 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java
@@ -73,7 +73,7 @@ public final class PluginServices {
     UserActivityDao userActivityDao;
 
     @Autowired
-    UserActivityOutstandingDao userActivityOustandingDao;
+    UserActivityOutstandingDao userActivityOutstandingDao;
 
     @Autowired
     TaskOutstandingDao taskOutstandingDao;
@@ -136,7 +136,7 @@ public final class PluginServices {
     }
 
     public static UserActivityOutstandingDao getUserActivityOutstandingDao() {
-        return getInstance().userActivityOustandingDao;
+        return getInstance().userActivityOutstandingDao;
     }
 
     public static ExceptionService getExceptionService() {