From d52fd02b8798b7f2b100c4c8cd2be7a612e173cb Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Tue, 10 Apr 2012 18:21:26 -0700 Subject: [PATCH] Implemented Tim's suggested cleanup to the pull requests from yesterday --- api/src/com/todoroo/astrid/api/Filter.java | 2 +- .../com/todoroo/astrid/actfm/sync/ActFmSyncService.java | 5 ----- .../com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java | 6 +++--- .../com/todoroo/astrid/subtasks/SubtasksUpdater.java | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/api/src/com/todoroo/astrid/api/Filter.java b/api/src/com/todoroo/astrid/api/Filter.java index 3e6b2960f..997b19a95 100644 --- a/api/src/com/todoroo/astrid/api/Filter.java +++ b/api/src/com/todoroo/astrid/api/Filter.java @@ -119,7 +119,7 @@ public class Filter extends FilterListItem { this.sqlQuery = sqlQuery; } - public void setFilterOverrideQuery(String filterOverride) { + public void setFilterQueryOverride(String filterOverride) { this.filterOverride = filterOverride; } diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java index e218524ac..15fcdf3e1 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java @@ -742,11 +742,6 @@ public final class ActFmSyncService { actFmDataService.saveUserData(userObject); } - if (serverTime == 0) { - Long[] allIds = ids.toArray(new Long[ids.size()]); - actFmDataService.userDao.deleteWhere(Criterion.not(User.REMOTE_ID.in(allIds))); - } - return result.optInt("time", 0); } 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 b295c842f..9a316dca3 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java @@ -121,7 +121,7 @@ public class ActFmSyncV2Provider extends SyncV2Provider { actFmPreferenceService.recordSyncStart(); - startUsersFetcher(manual, callback, finisher); + startUsersFetcher(callback, finisher); startTagFetcher(callback, finisher); @@ -134,12 +134,12 @@ public class ActFmSyncV2Provider extends SyncV2Provider { } /** fetch changes to users/friends */ - private void startUsersFetcher(final boolean manual, final SyncResultCallback callback, + private void startUsersFetcher(final SyncResultCallback callback, final AtomicInteger finisher) { new Thread(new Runnable() { @Override public void run() { - int time = manual ? 0 : Preferences.getInt(LAST_USERS_FETCH_TIME, 0); + int time = Preferences.getInt(LAST_USERS_FETCH_TIME, 0); try { time = actFmSyncService.fetchUsers(time); Preferences.setInt(LAST_USERS_FETCH_TIME, time); diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java index 594236ec4..837d2d823 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java @@ -109,7 +109,7 @@ public class SubtasksUpdater extends OrderedListUpdater { query = query.replace(TaskCriteria.isVisible().toString(), Criterion.all.toString()); - filter.setFilterOverrideQuery(query); + filter.setFilterQueryOverride(query); } }