From 4b3220c5a725f65f690409d2f639ad004c45bda4 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Wed, 13 Feb 2013 16:52:50 -0800 Subject: [PATCH] Fixed a couple more places where subtasks were using Task.ID instead of UUID --- .../astrid/subtasks/AstridOrderedListFragmentHelper.java | 4 ++-- .../com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index 12de667c4..b4f8846f7 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -273,8 +273,8 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen if(chained.size() > 0) { // move recurring items to item parent - TodorooCursor recurring = taskService.query(Query.select(Task.ID, Task.UUID, Task.RECURRENCE).where( - Criterion.and(Task.ID.in(chained.toArray(new Long[chained.size()])), + TodorooCursor recurring = taskService.query(Query.select(Task.UUID, Task.RECURRENCE).where( + Criterion.and(Task.UUID.in(chained.toArray(new String[chained.size()])), Task.RECURRENCE.isNotNull(), Functions.length(Task.RECURRENCE).gt(0)))); try { Task t = new Task(); diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java index 0c176b0bf..9c713340c 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java @@ -126,7 +126,7 @@ public abstract class AstridOrderedListUpdater { } } - public Node findNodeForTask(long taskId) { + public Node findNodeForTask(String taskId) { return idToNode.get(taskId); }