diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskMover.java b/app/src/main/java/com/todoroo/astrid/service/TaskMover.java index 49513593d..952e01cd4 100644 --- a/app/src/main/java/com/todoroo/astrid/service/TaskMover.java +++ b/app/src/main/java/com/todoroo/astrid/service/TaskMover.java @@ -106,7 +106,7 @@ public class TaskMover { long id = googleTask.getTask(); List children = googleTaskDao.getChildren(id); List childIds = from(children).transform(GoogleTask::getTask).toList(); - googleTaskDao.markDeleted(now(), id); + googleTaskDao.markDeleted(id, now()); if (selected instanceof GtasksFilter) { String listId = ((GtasksFilter) selected).getRemoteId(); @@ -153,7 +153,7 @@ public class TaskMover { children = caldavDao.getTasks(childIds); toDelete.addAll(childIds); } - caldavDao.markDeleted(now(), toDelete); + caldavDao.markDeleted(toDelete, now()); if (selected instanceof CaldavFilter) { long id1 = caldavTask.getTask(); diff --git a/app/src/main/java/org/tasks/data/CaldavDao.kt b/app/src/main/java/org/tasks/data/CaldavDao.kt index c8ab853b4..62472e01e 100644 --- a/app/src/main/java/org/tasks/data/CaldavDao.kt +++ b/app/src/main/java/org/tasks/data/CaldavDao.kt @@ -9,6 +9,7 @@ import io.reactivex.Single import org.tasks.date.DateTimeUtils.toAppleEpoch import org.tasks.db.DbUtils import org.tasks.filters.CaldavFilters +import org.tasks.time.DateTimeUtils.currentTimeMillis @Dao abstract class CaldavDao { @@ -94,7 +95,7 @@ abstract class CaldavDao { abstract fun getDeleted(calendar: String): List @Query("UPDATE caldav_tasks SET cd_deleted = :now WHERE cd_task IN (:tasks)") - abstract fun markDeleted(now: Long, tasks: List) + abstract fun markDeleted(tasks: List, now: Long = currentTimeMillis()) @Query("SELECT * FROM caldav_tasks WHERE cd_task = :taskId AND cd_deleted = 0 LIMIT 1") abstract fun getTask(taskId: Long): CaldavTask? diff --git a/app/src/main/java/org/tasks/data/GoogleTaskDao.kt b/app/src/main/java/org/tasks/data/GoogleTaskDao.kt index 87e121f9c..8177337f2 100644 --- a/app/src/main/java/org/tasks/data/GoogleTaskDao.kt +++ b/app/src/main/java/org/tasks/data/GoogleTaskDao.kt @@ -2,6 +2,7 @@ package org.tasks.data import androidx.room.* import com.todoroo.astrid.data.Task +import org.tasks.time.DateTimeUtils.currentTimeMillis @Dao abstract class GoogleTaskDao { @@ -70,7 +71,7 @@ abstract class GoogleTaskDao { abstract fun update(id: Long, parent: Long, order: Long) @Query("UPDATE google_tasks SET gt_deleted = :now WHERE gt_task = :task OR gt_parent = :task") - abstract fun markDeleted(now: Long, task: Long) + abstract fun markDeleted(task: Long, now: Long = currentTimeMillis()) @Delete abstract fun delete(deleted: GoogleTask)