Minor fix to not dupe RTM tasks on clone

evilsquid888 · Mar 4, 2011 · e013e7e · e013e7e
1 parent 3f9c957
commit e013e7e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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.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 Task clone(Task task) {
                         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
@@ -124,7 +124,7 @@ public void showChangeLog(Context context, int from) {
         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 " +