From dc7f2f5d5e1e58b66643ad4bd8ea8aaef84db1bd Mon Sep 17 00:00:00 2001 From: Tim Su Date: Mon, 16 May 2011 16:52:47 -0700 Subject: [PATCH] finish metadata clone clearing for all tasks --- .../src/com/todoroo/astrid/service/TaskService.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/astrid/src/com/todoroo/astrid/service/TaskService.java b/astrid/src/com/todoroo/astrid/service/TaskService.java index 3514a19f1..0cc08dc51 100644 --- a/astrid/src/com/todoroo/astrid/service/TaskService.java +++ b/astrid/src/com/todoroo/astrid/service/TaskService.java @@ -116,16 +116,15 @@ public class TaskService { metadata.readFromCursor(cursor); if(GtasksMetadata.METADATA_KEY.equals(metadata.getValue(Metadata.KEY))) - { - metadata.setValue(GtasksMetadata.ID, "0"); - } + metadata.setValue(GtasksMetadata.ID, "0"); //$NON-NLS-1$ if(ProducteevTask.METADATA_KEY.equals(metadata.getValue(Metadata.KEY))) - { metadata.setValue(ProducteevTask.ID, 0L); + if(MilkTaskFields.METADATA_KEY.equals(metadata.getValue(Metadata.KEY))) { + metadata.setValue(MilkTaskFields.TASK_ID, 0L); + metadata.setValue(MilkTaskFields.TASK_SERIES_ID, 0L); } - // don't clone sync metadata - if(MilkTaskFields.METADATA_KEY.equals(metadata.getValue(Metadata.KEY))) - continue; // FIXME do the same as for the others + if(OpencrxCoreUtils.OPENCRX_ACTIVITY_METADATA_KEY.equals(metadata.getValue(Metadata.KEY))) { + metadata.setValue(OpencrxCoreUtils.ACTIVITY_ID, 0L); metadata.setValue(Metadata.TASK, newId); metadata.clearValue(Metadata.ID);