From 37f78785d3a3a3eded1f0367558cb207badd7b20 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 22 Feb 2013 16:15:18 -0800
Subject: [PATCH] Don't want to always repopulate the queue from the
 outstanding tables, but allow other parts of the app to explicitly ask for it

---
 .../plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java  | 1 +
 .../com/todoroo/astrid/actfm/sync/ActFmSyncThread.java        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
index fe0e21ea2..828f66ee2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -354,6 +354,7 @@ public class TagViewFragment extends TaskListFragment {
                 }
             };
 
+            ActFmSyncThread.getInstance().repopulateQueueFromOutstandingTables();
             ActFmSyncThread.getInstance().enqueueMessage(new BriefMe<TagData>(TagData.class, tagData.getUuid(), tagData.getValue(TagData.PUSHED_AT)), callback);
             new FetchHistory<TagData>(tagDataDao, TagData.HISTORY_FETCH_DATE, NameMaps.TABLE_ID_TAGS, tagData.getUuid(), null, tagData.getValue(TagData.HISTORY_FETCH_DATE), true, null).execute();
         }
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 79117235a..9a4846409 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
@@ -210,13 +210,13 @@ public class ActFmSyncThread {
                 }
 
                 if (timeForBackgroundSync()) {
+                    repopulateQueueFromOutstandingTables();
                     enqueueMessage(BriefMe.instantiateBriefMeForClass(TaskListMetadata.class, NameMaps.PUSHED_AT_TASK_LIST_METADATA), defaultRefreshRunnable);
                     enqueueMessage(BriefMe.instantiateBriefMeForClass(Task.class, NameMaps.PUSHED_AT_TASKS), defaultRefreshRunnable);
                     enqueueMessage(BriefMe.instantiateBriefMeForClass(TagData.class, NameMaps.PUSHED_AT_TAGS), defaultRefreshRunnable);
                     enqueueMessage(BriefMe.instantiateBriefMeForClass(User.class, NameMaps.PUSHED_AT_USERS), defaultRefreshRunnable);
                     setTimeForBackgroundSync(false);
                 }
-                repopulateQueueFromOutstandingTables();
 
                 while (messageBatch.size() < batchSize && !pendingMessages.isEmpty()) {
                     ClientToServerMessage<?> message = pendingMessages.remove(0);
@@ -306,7 +306,7 @@ public class ActFmSyncThread {
         return isTimeForBackgroundSync;
     }
 
-    private void repopulateQueueFromOutstandingTables() {
+    public void repopulateQueueFromOutstandingTables() {
         constructChangesHappenedFromOutstandingTable(Task.class, taskDao, taskOutstandingDao);
         constructChangesHappenedFromOutstandingTable(TagData.class, tagDataDao, tagOutstandingDao);
         constructChangesHappenedFromOutstandingTable(UserActivity.class, userActivityDao, userActivityOutstandingDao);