Add default timestamp argument to markDeleted

pull/996/head
Alex Baker 6 years ago
parent bd519fb477
commit 0977503003

@ -106,7 +106,7 @@ public class TaskMover {
long id = googleTask.getTask();
List<GoogleTask> children = googleTaskDao.getChildren(id);
List<Long> 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();

@ -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<CaldavTask>
@Query("UPDATE caldav_tasks SET cd_deleted = :now WHERE cd_task IN (:tasks)")
abstract fun markDeleted(now: Long, tasks: List<Long>)
abstract fun markDeleted(tasks: List<Long>, now: Long = currentTimeMillis())
@Query("SELECT * FROM caldav_tasks WHERE cd_task = :taskId AND cd_deleted = 0 LIMIT 1")
abstract fun getTask(taskId: Long): CaldavTask?

@ -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)

Loading…
Cancel
Save