|
|
|
@ -172,9 +172,18 @@ class TasksJsonImporter @Inject constructor(
|
|
|
|
result.skipCount++
|
|
|
|
result.skipCount++
|
|
|
|
return@forEach
|
|
|
|
return@forEach
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (true == backup.caldavTasks
|
|
|
|
if (
|
|
|
|
|
|
|
|
backup.caldavTasks
|
|
|
|
?.filter { it.deleted == 0L }
|
|
|
|
?.filter { it.deleted == 0L }
|
|
|
|
?.any { caldavDao.getTask(it.calendar!!, it.`object`!!) != null }) {
|
|
|
|
?.any {
|
|
|
|
|
|
|
|
val existing = if (it.`object`.isNullOrBlank()) {
|
|
|
|
|
|
|
|
caldavDao.getTaskByRemoteId(it.calendar!!, it.remoteId!!)
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
caldavDao.getTask(it.calendar!!, it.`object`!!)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
existing != null
|
|
|
|
|
|
|
|
} == true
|
|
|
|
|
|
|
|
) {
|
|
|
|
result.skipCount++
|
|
|
|
result.skipCount++
|
|
|
|
return@forEach
|
|
|
|
return@forEach
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|