From 33a93a40ab5f2e2b40fcd181184a74e48aaee649 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 4 Mar 2013 17:00:15 -0800 Subject: [PATCH] Started implemented logic to do blocking gtasks import from the preferences --- .../astrid/gtasks/GtasksPreferences.java | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java index 0637a12f8..ce04faa3f 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java @@ -61,11 +61,36 @@ public class GtasksPreferences extends SyncProviderPreferences { startLogin(); } } else { - setResult(RESULT_CODE_SYNCHRONIZE); - finish(); + syncOrImport(); } } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode == REQUEST_LOGIN && resultCode == RESULT_OK) { + syncOrImport(); + } else { + super.onActivityResult(requestCode, resultCode, data); + } + } + + private void syncOrImport() { + if (actFmPreferenceService.isLoggedIn()) { + startBlockingImport(); + } else { + setResultForSynchronize(); + } + } + + private void setResultForSynchronize() { + setResult(RESULT_CODE_SYNCHRONIZE); + finish(); + } + + private void startBlockingImport() { + //TODO: Implement me + } + private void startLogin() { Intent intent = new Intent(this, GtasksLoginActivity.class); startActivityForResult(intent, REQUEST_LOGIN);