Convert defaultValues to map

app/src/main/java/com/todoroo/andlib/data/AbstractModel.java

@@ -17,6 +17,7 @@ import com.todoroo.andlib.utility.AndroidUtilities;
 
 import java.lang.reflect.Array;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import timber.log.Timber;
@@ -49,7 +50,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
     // --- abstract methods
 
     /** Get the default values for this object */
-    abstract public ContentValues getDefaultValues();
+    abstract public Map<String, Object> getDefaultValues();
 
     // --- data store variables and management
 
@@ -94,9 +95,8 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
     public ContentValues getMergedValues() {
         ContentValues mergedValues = new ContentValues();
 
-        ContentValues defaultValues = getDefaultValues();
+        for (Map.Entry<String, Object> entry : getDefaultValues().entrySet()) {
-        if(defaultValues != null) {
+            AndroidUtilities.putInto(mergedValues, entry.getKey(), entry.getValue());
-            mergedValues.putAll(defaultValues);
         }
         if(values != null) {
             mergedValues.putAll(values);

app/src/main/java/com/todoroo/astrid/data/Task.java

@@ -26,6 +26,9 @@ import com.todoroo.andlib.utility.DateUtilities;
 
 import org.tasks.time.DateTime;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import timber.log.Timber;
 
 import static org.tasks.date.DateTimeUtils.newDateTime;
@@ -223,7 +226,7 @@ public class Task extends AbstractModel {
     // --- defaults
 
     /** Default values container */
-    private static final ContentValues defaultValues = new ContentValues();
+    private static final Map<String, Object> defaultValues = new HashMap<>();
 
     static {
         defaultValues.put(TITLE.name, "");
@@ -247,7 +250,7 @@ public class Task extends AbstractModel {
     }
 
     @Override
-    public ContentValues getDefaultValues() {
+    public Map<String, Object> getDefaultValues() {
         return defaultValues;
     }