diff --git a/astrid/.classpath b/astrid/.classpath index 1307ffbce..26d3e6471 100644 --- a/astrid/.classpath +++ b/astrid/.classpath @@ -16,18 +16,19 @@ - - - - - - - - - - + + + + + + + + + + + diff --git a/astrid/build.xml b/astrid/build.xml index 74bdfc502..ec2b52396 100644 --- a/astrid/build.xml +++ b/astrid/build.xml @@ -114,7 +114,7 @@ - diff --git a/astrid/libs/google-api-client-1.5.0-beta.jar b/astrid/libs/google-api-client-1.5.0-beta.jar deleted file mode 100644 index 41f2e578e..000000000 Binary files a/astrid/libs/google-api-client-1.5.0-beta.jar and /dev/null differ diff --git a/astrid/libs/google-api-client-1.6.0-beta.jar b/astrid/libs/google-api-client-1.6.0-beta.jar new file mode 100644 index 000000000..5892bdc8d Binary files /dev/null and b/astrid/libs/google-api-client-1.6.0-beta.jar differ diff --git a/astrid/libs/google-api-client-extensions-1.5.0-beta.jar b/astrid/libs/google-api-client-extensions-1.5.0-beta.jar deleted file mode 100644 index b893cf2d1..000000000 Binary files a/astrid/libs/google-api-client-extensions-1.5.0-beta.jar and /dev/null differ diff --git a/astrid/libs/google-api-client-extensions-1.6.0-beta.jar b/astrid/libs/google-api-client-extensions-1.6.0-beta.jar new file mode 100644 index 000000000..e4eb75819 Binary files /dev/null and b/astrid/libs/google-api-client-extensions-1.6.0-beta.jar differ diff --git a/astrid/libs/google-api-client-extensions-android2-1.5.0-beta.jar b/astrid/libs/google-api-client-extensions-android2-1.5.0-beta.jar deleted file mode 100644 index 856f201eb..000000000 Binary files a/astrid/libs/google-api-client-extensions-android2-1.5.0-beta.jar and /dev/null differ diff --git a/astrid/libs/google-api-client-extensions-android2-1.6.0-beta.jar b/astrid/libs/google-api-client-extensions-android2-1.6.0-beta.jar new file mode 100644 index 000000000..cb05f66b3 Binary files /dev/null and b/astrid/libs/google-api-client-extensions-android2-1.6.0-beta.jar differ diff --git a/astrid/libs/google-api-services-tasks-v1-1.2.5-beta-sources.jar b/astrid/libs/google-api-services-tasks-v1-1.2.5-beta-sources.jar deleted file mode 100644 index b2214dfa9..000000000 Binary files a/astrid/libs/google-api-services-tasks-v1-1.2.5-beta-sources.jar and /dev/null differ diff --git a/astrid/libs/google-api-services-tasks-v1-1.2.5-beta.jar b/astrid/libs/google-api-services-tasks-v1-1.2.5-beta.jar deleted file mode 100644 index ef1ed0744..000000000 Binary files a/astrid/libs/google-api-services-tasks-v1-1.2.5-beta.jar and /dev/null differ diff --git a/astrid/libs/google-api-services-tasks-v1-1.3.0-beta-sources.jar b/astrid/libs/google-api-services-tasks-v1-1.3.0-beta-sources.jar new file mode 100644 index 000000000..cfb405c38 Binary files /dev/null and b/astrid/libs/google-api-services-tasks-v1-1.3.0-beta-sources.jar differ diff --git a/astrid/libs/google-api-services-tasks-v1-1.3.0-beta.jar b/astrid/libs/google-api-services-tasks-v1-1.3.0-beta.jar new file mode 100644 index 000000000..0b165d4da Binary files /dev/null and b/astrid/libs/google-api-services-tasks-v1-1.3.0-beta.jar differ diff --git a/astrid/libs/google-http-client-1.5.0-beta-sources.jar b/astrid/libs/google-http-client-1.5.0-beta-sources.jar deleted file mode 100644 index 9dc3a551c..000000000 Binary files a/astrid/libs/google-http-client-1.5.0-beta-sources.jar and /dev/null differ diff --git a/astrid/libs/google-http-client-1.5.0-beta.jar b/astrid/libs/google-http-client-1.5.0-beta.jar deleted file mode 100644 index b5e610ddf..000000000 Binary files a/astrid/libs/google-http-client-1.5.0-beta.jar and /dev/null differ diff --git a/astrid/libs/google-http-client-1.6.0-beta.jar b/astrid/libs/google-http-client-1.6.0-beta.jar new file mode 100644 index 000000000..052b2999b Binary files /dev/null and b/astrid/libs/google-http-client-1.6.0-beta.jar differ diff --git a/astrid/libs/google-http-client-extensions-1.5.0-beta.jar b/astrid/libs/google-http-client-extensions-1.5.0-beta.jar deleted file mode 100644 index c9b6ef72b..000000000 Binary files a/astrid/libs/google-http-client-extensions-1.5.0-beta.jar and /dev/null differ diff --git a/astrid/libs/google-http-client-extensions-1.6.0-beta.jar b/astrid/libs/google-http-client-extensions-1.6.0-beta.jar new file mode 100644 index 000000000..3a5a74617 Binary files /dev/null and b/astrid/libs/google-http-client-extensions-1.6.0-beta.jar differ diff --git a/astrid/libs/google-http-client-extensions-android2-1.5.0-beta.jar b/astrid/libs/google-http-client-extensions-android2-1.5.0-beta.jar deleted file mode 100644 index e5fd826af..000000000 Binary files a/astrid/libs/google-http-client-extensions-android2-1.5.0-beta.jar and /dev/null differ diff --git a/astrid/libs/google-http-client-extensions-android2-1.6.0-beta.jar b/astrid/libs/google-http-client-extensions-android2-1.6.0-beta.jar new file mode 100644 index 000000000..aefb9b339 Binary files /dev/null and b/astrid/libs/google-http-client-extensions-android2-1.6.0-beta.jar differ diff --git a/astrid/libs/google-http-client-extensions-android3-1.6.0-beta.jar b/astrid/libs/google-http-client-extensions-android3-1.6.0-beta.jar new file mode 100644 index 000000000..e8d5fcad8 Binary files /dev/null and b/astrid/libs/google-http-client-extensions-android3-1.6.0-beta.jar differ diff --git a/astrid/libs/google-oauth-client-1.5.0-beta.jar b/astrid/libs/google-oauth-client-1.6.0-beta.jar similarity index 66% rename from astrid/libs/google-oauth-client-1.5.0-beta.jar rename to astrid/libs/google-oauth-client-1.6.0-beta.jar index af73e9aa4..e32e4b102 100644 Binary files a/astrid/libs/google-oauth-client-1.5.0-beta.jar and b/astrid/libs/google-oauth-client-1.6.0-beta.jar differ diff --git a/astrid/libs/google-oauth-client-extensions-1.5.0-beta.jar b/astrid/libs/google-oauth-client-extensions-1.5.0-beta.jar deleted file mode 100644 index f253f0132..000000000 Binary files a/astrid/libs/google-oauth-client-extensions-1.5.0-beta.jar and /dev/null differ diff --git a/astrid/libs/google-oauth-client-extensions-1.6.0-beta.jar b/astrid/libs/google-oauth-client-extensions-1.6.0-beta.jar new file mode 100644 index 000000000..2bfacf12d Binary files /dev/null and b/astrid/libs/google-oauth-client-extensions-1.6.0-beta.jar differ diff --git a/astrid/libs/gson-1.6.jar b/astrid/libs/gson-1.6.jar deleted file mode 100644 index 40648939f..000000000 Binary files a/astrid/libs/gson-1.6.jar and /dev/null differ diff --git a/astrid/libs/gson-1.7.1.jar b/astrid/libs/gson-1.7.1.jar new file mode 100644 index 000000000..eb542743c Binary files /dev/null and b/astrid/libs/gson-1.7.1.jar differ diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java index eaee5d31c..1e6497e43 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java @@ -94,16 +94,16 @@ public class GtasksInvoker { * @throws IOException */ public void ping() throws IOException { - service.tasklists.get("@default").execute(); + service.tasklists().get("@default").execute(); } public TaskLists allGtaskLists() throws IOException { TaskLists toReturn = null; try { - toReturn = service.tasklists.list().execute(); + toReturn = service.tasklists().list().execute(); } catch (IOException e) { handleException(e); - toReturn = service.tasklists.list().execute(); + toReturn = service.tasklists().list().execute(); } finally { log("All gtasks lists", toReturn); } @@ -113,10 +113,10 @@ public class GtasksInvoker { public TaskList getGtaskList(String id) throws IOException { TaskList toReturn = null; try { - toReturn = service.tasklists.get(id).execute(); + toReturn = service.tasklists().get(id).execute(); } catch (IOException e) { handleException(e); - toReturn = service.tasklists.get(id).execute(); + toReturn = service.tasklists().get(id).execute(); } finally { log("Get gtask list, id: " + id, toReturn); } @@ -128,10 +128,10 @@ public class GtasksInvoker { newList.setTitle(title); TaskList toReturn = null; try { - toReturn = service.tasklists.insert(newList).execute(); + toReturn = service.tasklists().insert(newList).execute(); } catch (IOException e) { handleException(e); - toReturn = service.tasklists.insert(newList).execute(); + toReturn = service.tasklists().insert(newList).execute(); } finally { log("Create gtask list, title: " + title, toReturn); } @@ -141,10 +141,10 @@ public class GtasksInvoker { public TaskList updateGtaskList(TaskList list) throws IOException { TaskList toReturn = null; try { - toReturn = service.tasklists.update(list.getId(), list).execute(); + toReturn = service.tasklists().update(list.getId(), list).execute(); } catch (IOException e) { handleException(e); - toReturn = service.tasklists.update(list.getId(), list).execute(); + toReturn = service.tasklists().update(list.getId(), list).execute(); } finally { log("Update list, id: " + list.getId(), toReturn); } @@ -153,10 +153,10 @@ public class GtasksInvoker { public void deleteGtaskList(String listId) throws IOException { try { - service.tasklists.delete(listId).execute(); + service.tasklists().delete(listId).execute(); } catch (IOException e) { handleException(e); - service.tasklists.delete(listId).execute(); + service.tasklists().delete(listId).execute(); } finally { log("Delete list, id: " + listId, null); } @@ -168,7 +168,7 @@ public class GtasksInvoker { public com.google.api.services.tasks.model.Tasks getAllGtasksFromListId(String listId, boolean includeDeleted, boolean includeHidden, long lastSyncDate) throws IOException { com.google.api.services.tasks.model.Tasks toReturn = null; - List request = service.tasks.list(listId); + List request = service.tasks().list(listId); request.setShowDeleted(includeDeleted); request.setShowHidden(includeHidden); request.setUpdatedMin(GtasksApiUtilities.unixTimeToGtasksCompletionTime(lastSyncDate).toStringRfc3339()); @@ -186,10 +186,10 @@ public class GtasksInvoker { public Task getGtask(String listId, String taskId) throws IOException { Task toReturn = null; try { - toReturn = service.tasks.get(listId, taskId).execute(); + toReturn = service.tasks().get(listId, taskId).execute(); } catch (IOException e) { handleException(e); - toReturn = service.tasks.get(listId, taskId).execute(); + toReturn = service.tasks().get(listId, taskId).execute(); } finally { log("Get gtask, id: " + taskId + ", list id: " + listId, toReturn); } @@ -210,7 +210,7 @@ public class GtasksInvoker { } public Task createGtask(String listId, Task task, String parent, String priorSiblingId) throws IOException { - Insert insertOp = service.tasks.insert(listId, task); + Insert insertOp = service.tasks().insert(listId, task); insertOp.setParent(parent); insertOp.setPrevious(priorSiblingId); @@ -229,10 +229,10 @@ public class GtasksInvoker { public Task updateGtask(String listId, Task task) throws IOException { Task toReturn = null; try { - toReturn = service.tasks.update(listId, task.getId(), task).execute(); + toReturn = service.tasks().update(listId, task.getId(), task).execute(); } catch (IOException e) { handleException(e); - toReturn = service.tasks.update(listId, task.getId(), task).execute(); + toReturn = service.tasks().update(listId, task.getId(), task).execute(); } finally { log("Update gtask, title: " + task.getTitle(), toReturn); } @@ -240,7 +240,7 @@ public class GtasksInvoker { } public Task moveGtask(String listId, String taskId, String parentId, String previousId) throws IOException { - Move move = service.tasks.move(listId, taskId); + Move move = service.tasks().move(listId, taskId); move.setParent(parentId); move.setPrevious(previousId); @@ -258,10 +258,10 @@ public class GtasksInvoker { public void deleteGtask(String listId, String taskId) throws IOException { try { - service.tasks.delete(listId, taskId).execute(); + service.tasks().delete(listId, taskId).execute(); } catch (IOException e) { handleException(e); - service.tasks.delete(listId, taskId).execute(); + service.tasks().delete(listId, taskId).execute(); } finally { log("Delete task, id: " + taskId, null); } @@ -269,10 +269,10 @@ public class GtasksInvoker { public void clearCompletedTasks(String listId) throws IOException { try { - service.tasks.clear(listId).execute(); + service.tasks().clear(listId).execute(); } catch (IOException e) { handleException(e); - service.tasks.clear(listId).execute(); + service.tasks().clear(listId).execute(); } finally { log("Clear completed tasks, list id: " + listId, null); }