Fix cloning google tasks

pull/2803/head
Alex Baker 2 months ago
parent 91887f6b17
commit 4ff7b18c0f

@ -67,7 +67,7 @@ class TaskDuplicator @Inject constructor(
tagDao.insert(tags.map { Tag(clone, it) }) tagDao.insert(tags.map { Tag(clone, it) })
} }
val googleTask = googleTaskDao.getByTaskId(task.id) val googleTask = googleTaskDao.getByTaskId(task.id)
val addToTop = preferences.addTasksToTop() val caldavTask = caldavDao.getTask(task.id)
if (googleTask != null) { if (googleTask != null) {
googleTaskDao.insertAndShift( googleTaskDao.insertAndShift(
clone, clone,
@ -76,11 +76,9 @@ class TaskDuplicator @Inject constructor(
calendar = googleTask.calendar, calendar = googleTask.calendar,
remoteId = null remoteId = null
), ),
addToTop preferences.addTasksToTop()
) )
} } else if (caldavTask != null) {
val caldavTask = caldavDao.getTask(task.id)
if (caldavTask != null) {
val newDavTask = CaldavTask( val newDavTask = CaldavTask(
task = clone.id, task = clone.id,
calendar = caldavTask.calendar calendar = caldavTask.calendar
@ -89,7 +87,7 @@ class TaskDuplicator @Inject constructor(
val remoteParent = caldavDao.getRemoteIdForTask(parentId) val remoteParent = caldavDao.getRemoteIdForTask(parentId)
newDavTask.remoteParent = remoteParent newDavTask.remoteParent = remoteParent
} }
caldavDao.insert(clone, newDavTask, addToTop) caldavDao.insert(clone, newDavTask, preferences.addTasksToTop())
} }
for (g in locationDao.getGeofencesForTask(task.id)) { for (g in locationDao.getGeofencesForTask(task.id)) {
locationDao.insert( locationDao.insert(

Loading…
Cancel
Save