diff --git a/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt b/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt index ab10764e8..0053c5d3f 100644 --- a/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt +++ b/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt @@ -172,9 +172,18 @@ class TasksJsonImporter @Inject constructor( result.skipCount++ return@forEach } - if (true == backup.caldavTasks - ?.filter { it.deleted == 0L } - ?.any { caldavDao.getTask(it.calendar!!, it.`object`!!) != null }) { + if ( + backup.caldavTasks + ?.filter { it.deleted == 0L } + ?.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++ return@forEach }