diff --git a/astrid/src/com/todoroo/astrid/service/TaskService.java b/astrid/src/com/todoroo/astrid/service/TaskService.java index e6301b076..1ef6bfc0a 100644 --- a/astrid/src/com/todoroo/astrid/service/TaskService.java +++ b/astrid/src/com/todoroo/astrid/service/TaskService.java @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.weloveastrid.rmilk.data.MilkTaskFields; + import android.content.ContentValues; import com.todoroo.andlib.data.Property; @@ -115,6 +117,8 @@ public class TaskService { continue; if(ProducteevTask.METADATA_KEY.equals(metadata.getValue(Metadata.KEY))) continue; + if(MilkTaskFields.METADATA_KEY.equals(metadata.getValue(Metadata.KEY))) + continue; metadata.setValue(Metadata.TASK, newId); metadata.clearValue(Metadata.ID); diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index 849963897..4c00111bd 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -124,7 +124,7 @@ public final class UpgradeService { StringBuilder changeLog = new StringBuilder(); if(from <= V2_14_4) { - newVersionString(changeLog, "3.6.0 (11/13/10)", new String[] { + newVersionString(changeLog, "3.7.2 (3/04/11)", new String[] { "Astrid is brand new inside and out! In addition to a new " + "look and feel, a new add-on system allows Astrid to become " + "more powerful, while other improvements have made it faster " +