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 902b51d7f..909dd9af2 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java @@ -205,8 +205,8 @@ public class ActFmSyncThread { } public static void clearTablePushedAtValues() { - String[] pushedAtPrefs = new String[] { NameMaps.PUSHED_AT_TASKS, NameMaps.PUSHED_AT_TAGS, - NameMaps.PUSHED_AT_ACTIVITY, NameMaps.PUSHED_AT_USERS, NameMaps.PUSHED_AT_TASK_LIST_METADATA }; + String[] pushedAtPrefs = new String[] { NameMaps.PUSHED_AT_TASKS, NameMaps.PUSHED_AT_TAGS, NameMaps.PUSHED_AT_ACTIVITY, + NameMaps.PUSHED_AT_USERS, NameMaps.PUSHED_AT_TASK_LIST_METADATA, NameMaps.PUSHED_AT_WAITING_ON_ME }; for (String key : pushedAtPrefs) Preferences.clear(key); } diff --git a/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java b/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java index c29b70d30..10a1749d4 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java @@ -304,13 +304,7 @@ public class OldTaskPreferences extends TodorooPreferenceActivity { DialogUtilities.okCancelDialog(this, getString(R.string.EPr_reset_sync_state_detailed), new OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - pd = DialogUtilities.runWithProgressDialog(OldTaskPreferences.this, new Runnable() { - @Override - public void run() { - ActFmSyncThread.clearTablePushedAtValues(); - //TODO: Maybe clear outstanding tables? - } - }); + ActFmSyncThread.clearTablePushedAtValues(); } }, null); } diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml index ff39e2071..00fcef0ea 100644 --- a/astrid/res/values/strings-actfm.xml +++ b/astrid/res/values/strings-actfm.xml @@ -377,7 +377,7 @@ Sync ongoing... Reset sync - Refreshes sync token and resets some local data to help resolve sync errors + Resets some local data to help resolve sync errors The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue?