From 278480895ffa16062210aafbbddae9f0ed5339b9 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Thu, 7 Jun 2012 11:21:48 -0700 Subject: [PATCH] Don't use server time for syncing users --- .../com/todoroo/astrid/actfm/sync/ActFmSyncService.java | 4 ++-- .../com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 03a69d4c0..7389b944c 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java @@ -778,12 +778,12 @@ public final class ActFmSyncService { return result.optInt("time", 0); } - public int fetchUsers(int serverTime) throws JSONException, IOException { + public int fetchUsers() throws JSONException, IOException { if (!checkForToken()) return 0; JSONObject result = actFmInvoker.invoke("user_list", - "token", token, "modified_after", serverTime); + "token", token); JSONArray users = result.getJSONArray("list"); HashSet ids = new HashSet(); if (users.length() > 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 9f3ac3e25..e26809ef8 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java @@ -194,7 +194,7 @@ public class ActFmSyncV2Provider extends SyncV2Provider { public void run() { int time = Preferences.getInt(LAST_USERS_FETCH_TIME, 0); try { - time = actFmSyncService.fetchUsers(time); + time = actFmSyncService.fetchUsers(); Preferences.setInt(LAST_USERS_FETCH_TIME, time); } catch (JSONException e) { handler.handleException("actfm-sync", e, e.toString()); //$NON-NLS-1$