From 248791d3781a20d14f4ccf5b77f96e9dee498232 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 28 Sep 2010 15:04:01 -0700
Subject: [PATCH] Fix compile errors

---
 .../todoroo/astrid/gtasks/GtasksMetadata.java   |  2 +-
 .../astrid/gtasks/GtasksSyncActionExposer.java  | 17 ++++++-----------
 .../astrid/gtasks/sync/GtasksSyncProvider.java  |  5 +++--
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java
index 3d5a189ef..e8fd13b0d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java
@@ -43,7 +43,7 @@ public class GtasksMetadata {
     public static Metadata createEmptyMetadata(long taskId) {
         Metadata metadata = new Metadata();
         metadata.setValue(Metadata.KEY, GtasksMetadata.METADATA_KEY);
-        metadata.setValue(ID, (long)VALUE_UNSET);
+        metadata.setValue(ID, ""); //$NON-NLS-1$
         metadata.setValue(LIST_ID, Preferences.getStringValue(GtasksPreferenceService.PREF_DEFAULT_LIST));
         metadata.setValue(PARENT_TASK, (long)VALUE_UNSET);
         metadata.setValue(INDENT, 0);
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java
index fc53ecf23..f548359d3 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java
@@ -3,9 +3,7 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import org.json.JSONArray;
 import org.json.JSONException;
-import org.json.JSONObject;
 
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ -18,6 +16,7 @@ import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.SyncAction;
+import com.todoroo.gtasks.GoogleTaskListInfo;
 
 /**
  * Exposes sync action
@@ -37,15 +36,11 @@ public class GtasksSyncActionExposer extends BroadcastReceiver {
         if(intent.getBooleanExtra("setup", false)) {
             gtasksPreferenceService.setToken("haha");
             try {
-                JSONArray newLists = new JSONArray();
-                JSONObject list = new JSONObject();
-                list.put("id", "1");
-                list.put("title", "Tim's Tasks");
-                newLists.put(list);
-                list = new JSONObject();
-                list.put("id", "2");
-                list.put("title", "Travel");
-                newLists.put(list);
+                GoogleTaskListInfo[] newLists = new GoogleTaskListInfo[2];
+                GoogleTaskListInfo list = new GoogleTaskListInfo("1", "Tim's Tasks");
+                newLists[0] = list;
+                list = new GoogleTaskListInfo("2", "Travel");
+                newLists[1] = list;
                 gtasksListService.updateLists(newLists);
             } catch (JSONException e) {
                 throw new RuntimeException(e);
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java
index cb0abb3cf..05599f991 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java
@@ -48,10 +48,10 @@ import com.todoroo.astrid.sync.SyncProvider;
 import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Preferences;
 import com.todoroo.gtasks.GoogleTaskService;
+import com.todoroo.gtasks.GoogleTaskService.ConvenientTaskCreator;
 import com.todoroo.gtasks.GoogleTaskTask;
 import com.todoroo.gtasks.GoogleTaskView;
 import com.todoroo.gtasks.GoogleTasksException;
-import com.todoroo.gtasks.GoogleTaskService.ConvenientTaskCreator;
 import com.todoroo.gtasks.actions.Action;
 import com.todoroo.gtasks.actions.Actions;
 import com.todoroo.gtasks.actions.GetTasksAction;
@@ -160,13 +160,14 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
 
             // check if we have a token & it works
             if(authToken != null) {
+
                 taskService.getTaskView();
                 performSync();
             } else {
                 if (email == null && password == null) {
                     // we can't do anything, user is not logged in
                 } else {
-                    authToken = null; // TODO set up auth token
+                    //authToken = null; // TODO set up auth token
                     performSync();
                 }
             }