diff --git a/api/src/com/todoroo/astrid/sync/SyncV2Provider.java b/api/src/com/todoroo/astrid/sync/SyncV2Provider.java index 7372beb4a..ed81eddc0 100644 --- a/api/src/com/todoroo/astrid/sync/SyncV2Provider.java +++ b/api/src/com/todoroo/astrid/sync/SyncV2Provider.java @@ -7,6 +7,8 @@ package com.todoroo.astrid.sync; import java.io.IOException; +import android.app.Activity; + import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; @@ -74,7 +76,7 @@ abstract public class SyncV2Provider { /** * Sign out of service, deleting all synchronization metadata */ - abstract public void signOut(); + abstract public void signOut(Activity activity); /** * @return sync utility instance diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java index 8159711b1..6f7af0b0a 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java @@ -101,7 +101,7 @@ public class ActFmPreferences extends SyncProviderPreferences { @Override public void logOut() { - new ActFmSyncV2Provider().signOut(); + new ActFmSyncV2Provider().signOut(this); } @Override 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 8f38be6ac..50db43448 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java @@ -9,6 +9,8 @@ import java.io.IOException; import org.json.JSONObject; +import android.app.Activity; + import com.timsu.astrid.GCMIntentService; import com.timsu.astrid.R; import com.todoroo.andlib.service.Autowired; @@ -59,7 +61,7 @@ public class ActFmSyncV2Provider extends SyncV2Provider { } @Override - public void signOut() { + public void signOut(Activity activity) { actFmPreferenceService.setToken(null); actFmPreferenceService.clearLastSyncDate(); ActFmPreferenceService.premiumLogout(); diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncUpgradePrompt.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncUpgradePrompt.java index dd431d807..6bc95a2c9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncUpgradePrompt.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncUpgradePrompt.java @@ -58,7 +58,7 @@ public class SyncUpgradePrompt { R.string.sync_upgr_both_btn2, new Runnable() { @Override public void run() { - new ActFmSyncV2Provider().signOut(); + new ActFmSyncV2Provider().signOut(activity); Toast.makeText(activity, R.string.sync_upgr_logged_out, Toast.LENGTH_LONG).show(); } }); diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java index 2292a0625..236a8025c 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java @@ -136,7 +136,7 @@ public class GtasksPreferences extends SyncProviderPreferences { @Override public void logOut() { - GtasksSyncV2Provider.getInstance().signOut(); + GtasksSyncV2Provider.getInstance().signOut(this); } @Override 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 9f174737f..9cd74558b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.json.JSONException; +import android.app.Activity; import android.text.TextUtils; import com.google.api.services.tasks.model.Tasks; @@ -104,7 +105,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider { } @Override - public void signOut() { + public void signOut(Activity activity) { gtasksPreferenceService.clearLastSyncDate(); gtasksPreferenceService.setToken(null); Preferences.setString(GtasksPreferenceService.PREF_USER_NAME, null);