From 1241967d735866165835eed60963e92e411f66d6 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 4 Mar 2013 16:54:44 -0800 Subject: [PATCH] Don't consider gtasks sync provider 'active' if astrid logged in --- .../astrid/gtasks/sync/GtasksSyncV2Provider.java | 2 +- .../com/todoroo/astrid/service/SyncV2Service.java | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java index 8ab3a88e7..a86cb2fe8 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java @@ -108,7 +108,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider { @Override public boolean isActive() { - return gtasksPreferenceService.isLoggedIn(); + return gtasksPreferenceService.isLoggedIn() && !actFmPreferenceService.isLoggedIn(); } @Override diff --git a/astrid/src/com/todoroo/astrid/service/SyncV2Service.java b/astrid/src/com/todoroo/astrid/service/SyncV2Service.java index 18645e1d1..7e36288f6 100644 --- a/astrid/src/com/todoroo/astrid/service/SyncV2Service.java +++ b/astrid/src/com/todoroo/astrid/service/SyncV2Service.java @@ -68,19 +68,8 @@ public class SyncV2Service { if (active.size() == 0) return false; - if (active.size() > 1) { - SyncResultCallback newCallback = new WidgetUpdatingCallbackWrapper(callback) { - private int next = 1; - - @Override - public void finished() { - super.finished(); - if (next < active.size()) - active.get(next++).synchronizeActiveTasks(manual, this); - } - }; - - active.get(0).synchronizeActiveTasks(manual, newCallback); + if (active.size() > 1) { // This should never happen anymore--they can't be active at the same time, but if for some reason they both are, just use ActFm + active.get(1).synchronizeActiveTasks(manual, new WidgetUpdatingCallbackWrapper(callback)); } else if (active.size() == 1) { active.get(0).synchronizeActiveTasks(manual, new WidgetUpdatingCallbackWrapper(callback)); }