diff --git a/app/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java index e9a76facd..1df5145d1 100644 --- a/app/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java +++ b/app/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java @@ -128,17 +128,16 @@ class OrderedMetadataListFragmentHelper { private void setCompletedForItemAndSubtasks(final Task item, final boolean completedState) { final long itemId = item.getId(); - final Task model = new Task(); final long completionDate = completedState ? DateUtilities.now() : 0; if(!completedState) { ArrayList chained = chainedCompletions.get(itemId); if(chained != null) { for(Long taskId : chained) { + Task model = new Task(); model.setId(taskId); model.setCompletionDate(completionDate); taskDao.save(model); - model.clear(); } taskAdapter.notifyDataSetInvalidated(); } @@ -155,10 +154,10 @@ class OrderedMetadataListFragmentHelper { googleTaskDao.update(googleTask); } + Task model = new Task(); model.setId(node.taskId); model.setCompletionDate(completionDate); taskDao.save(model); - model.clear(); chained.add(node.taskId); }); diff --git a/app/src/main/java/com/todoroo/andlib/data/AbstractModel.java b/app/src/main/java/com/todoroo/andlib/data/AbstractModel.java index ba98d6084..96be06638 100644 --- a/app/src/main/java/com/todoroo/andlib/data/AbstractModel.java +++ b/app/src/main/java/com/todoroo/andlib/data/AbstractModel.java @@ -112,14 +112,6 @@ public abstract class AbstractModel implements Parcelable, Cloneable { return mergedValues; } - /** - * Clear all data on this model - */ - public void clear() { - values = null; - setValues = null; - } - /** * Transfers all set values into values. This occurs when a task is * saved - future saves will not need to write all the data as before. diff --git a/app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java b/app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java index cbc9cfa06..956534999 100755 --- a/app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java @@ -165,7 +165,7 @@ public class TasksXmlImporter { private class Format2TaskImporter { XmlPullParser xpp; - final Task currentTask = new Task(); + Task currentTask; public Format2TaskImporter() { } public Format2TaskImporter(XmlPullParser xpp) throws XmlPullParserException, IOException { @@ -198,7 +198,7 @@ public class TasksXmlImporter { void parseTask() { taskCount++; setProgressMessage(activity.getString(R.string.import_progress_read, taskCount)); - currentTask.clear(); + currentTask = new Task(); String title = xpp.getAttributeValue(null, Task.TITLE.name); String created = xpp.getAttributeValue(null, Task.CREATION_DATE.name); diff --git a/app/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/app/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index 51b3b3844..bc150c13f 100644 --- a/app/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/app/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -124,16 +124,15 @@ class AstridOrderedListFragmentHelper { private void setCompletedForItemAndSubtasks(final Task item, final boolean completedState) { final String itemId = item.getUuid(); - final Task model = new Task(); final long completionDate = completedState ? DateUtilities.now() : 0; if(!completedState) { ArrayList chained = chainedCompletions.get(itemId); if(chained != null) { for(String taskId : chained) { + Task model = new Task(); model.setCompletionDate(completionDate); taskDao.update(Task.UUID.eq(taskId), model); - model.clear(); } taskAdapter.notifyDataSetInvalidated(); } @@ -143,9 +142,9 @@ class AstridOrderedListFragmentHelper { final ArrayList chained = new ArrayList<>(); updater.applyToDescendants(itemId, node -> { String uuid = node.uuid; + Task model = new Task(); model.setCompletionDate(completionDate); taskDao.update(Task.UUID.eq(uuid), model); - model.clear(); chained.add(node.uuid); });