From d57cd119ae7a92b044c1e37ea35c77fe3a39ca50 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Thu, 14 Jul 2011 17:33:32 -0700
Subject: [PATCH] Adapt to prettier OAUTH google login

---
 .../com/todoroo/astrid/actfm/ActFmLoginActivity.java  | 11 ++++-------
 .../com/todoroo/astrid/actfm/OAuthLoginActivity.java  |  6 ++----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
index 4868f8fc1..0e367669c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
@@ -71,6 +71,7 @@ import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmInvoker;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
+import com.todoroo.astrid.actfm.sync.ActFmSyncProvider;
 import com.todoroo.astrid.gtasks.auth.ModernAuthManager;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 import com.todoroo.astrid.service.StatisticsService;
@@ -366,8 +367,9 @@ public class ActFmLoginActivity extends Activity implements AuthListener {
         setResult(RESULT_OK);
         finish();
 
-        if(!noSync)
-            synchronize();
+        if(!noSync) {
+            new ActFmSyncProvider().synchronize(this);
+        }
 
         try {
             C2DMReceiver.register();
@@ -390,11 +392,6 @@ public class ActFmLoginActivity extends Activity implements AuthListener {
         });
     }
 
-    public void synchronize() {
-        startService(new Intent(null, null,
-                this, ActFmBackgroundService.class));
-    }
-
     // --- google account manager
 
     @SuppressWarnings("nls")
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/OAuthLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/OAuthLoginActivity.java
index 2eb3cf2d9..925fdfff0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/OAuthLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/OAuthLoginActivity.java
@@ -79,14 +79,12 @@ public class OAuthLoginActivity extends Activity {
             @Override
             public void onPageFinished(WebView view, String url) {
                 super.onPageFinished(view, url);
-                System.err.println("page finished loading: " + url);
-
                 String data;
                 try {
                     data = restClient.get(url);
-                    System.err.println("DATA: " + data);
 
-                    if(data.startsWith("{")) { //$NON-NLS-1$
+                    if(data.startsWith("<!-- success -->")) { //$NON-NLS-1$
+                        data = data.substring(data.indexOf('{'), data.lastIndexOf('}') + 1);
                         Intent intent = new Intent();
                         intent.putExtra(DATA_RESPONSE, data);
                         setResult(RESULT_OK, intent);