From b5562dd71b496e1aff662868a3d7e59a0e392266 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 7 Feb 2013 17:02:14 -0800
Subject: [PATCH] Do a BriefMe for users as a part of general sync

---
 .../com/todoroo/astrid/actfm/sync/ActFmSyncThread.java         | 2 ++
 .../com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java     | 3 ++-
 .../com/todoroo/astrid/actfm/sync/messages/NameMaps.java       | 1 +
 .../com/todoroo/astrid/actfm/sync/messages/NowBriefed.java     | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

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 896f3f248..c30eebd9b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
@@ -42,6 +42,7 @@ import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.TagOutstanding;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.TaskOutstanding;
+import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.data.UserActivity;
 import com.todoroo.astrid.data.UserActivityOutstanding;
 
@@ -184,6 +185,7 @@ public class ActFmSyncThread {
                 if (messageBatch.isEmpty() && timeForBackgroundSync()) {
                     messageBatch.add(BriefMe.instantiateBriefMeForClass(Task.class, NameMaps.PUSHED_AT_TASKS));
                     messageBatch.add(BriefMe.instantiateBriefMeForClass(TagData.class, NameMaps.PUSHED_AT_TAGS));
+                    messageBatch.add(BriefMe.instantiateBriefMeForClass(User.class, NameMaps.PUSHED_AT_USERS));
                     refreshAfterBatch = true;
                 }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
index dbe856b9f..62af711df 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
@@ -188,7 +188,8 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
                 };
 
                 ActFmSyncThread.getInstance().enqueueMessage(BriefMe.instantiateBriefMeForClass(Task.class, NameMaps.PUSHED_AT_TASKS), null);
-                ActFmSyncThread.getInstance().enqueueMessage(BriefMe.instantiateBriefMeForClass(TagData.class, NameMaps.PUSHED_AT_TAGS), refreshCallback);
+                ActFmSyncThread.getInstance().enqueueMessage(BriefMe.instantiateBriefMeForClass(TagData.class, NameMaps.PUSHED_AT_TAGS), null);
+                ActFmSyncThread.getInstance().enqueueMessage(BriefMe.instantiateBriefMeForClass(User.class, NameMaps.PUSHED_AT_USERS), refreshCallback);
 
 //                startUsersSync(callback, finisher);
 //
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 200d04ea4..348ae579b 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
@@ -32,6 +32,7 @@ public class NameMaps {
     private static final String PUSHED_AT_PREFIX = "pushed_at";
     public static final String PUSHED_AT_TASKS = PUSHED_AT_PREFIX + "_" + TABLE_ID_TASKS;
     public static final String PUSHED_AT_TAGS = PUSHED_AT_PREFIX + "_" + TABLE_ID_TAGS;
+    public static final String PUSHED_AT_USERS = PUSHED_AT_PREFIX + "_" + TABLE_ID_USERS;
     public static final String PUSHED_AT_ACTIVITY = PUSHED_AT_PREFIX + "_" + TABLE_ID_USER_ACTIVITY;
 
     static {
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java
index 3292a8d7e..7177e0cc5 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java
@@ -45,6 +45,8 @@ public class NowBriefed<TYPE extends RemoteModel> extends ServerToClientMessage
                     pushedAtKey = NameMaps.PUSHED_AT_TAGS;
                 else if (NameMaps.TABLE_ID_USER_ACTIVITY.equals(table))
                     pushedAtKey = NameMaps.PUSHED_AT_ACTIVITY;
+                else if (NameMaps.TABLE_ID_USERS.equals(table))
+                    pushedAtKey = NameMaps.PUSHED_AT_USERS;
 
                 if (pushedAtKey != null)
                     Preferences.setLong(pushedAtKey, pushedAt);