diff --git a/app/src/main/java/org/tasks/backup/BackupContainer.kt b/app/src/main/java/org/tasks/backup/BackupContainer.kt index 5e7568b01..2685be3a1 100644 --- a/app/src/main/java/org/tasks/backup/BackupContainer.kt +++ b/app/src/main/java/org/tasks/backup/BackupContainer.kt @@ -48,7 +48,7 @@ class BackupContainer( val comments: List, val attachments: List?, val caldavTasks: List?, - val vtodo: String?, + val vtodo: String? = null, val google: List = emptyList(), ) { val locations: List = emptyList() diff --git a/app/src/main/java/org/tasks/backup/TasksJsonExporter.kt b/app/src/main/java/org/tasks/backup/TasksJsonExporter.kt index 0ba41c4ba..ed6f02ac1 100755 --- a/app/src/main/java/org/tasks/backup/TasksJsonExporter.kt +++ b/app/src/main/java/org/tasks/backup/TasksJsonExporter.kt @@ -125,15 +125,16 @@ class TasksJsonExporter @Inject constructor( val caldavTasks = caldavDao.getTasks(taskId) taskBackups.add( TaskBackup( - task, - alarmDao.getAlarms(taskId), - locationDao.getGeofencesForTask(taskId), - tagDao.getTagsForTask(taskId), - userActivityDao.getComments(taskId), - taskAttachmentDao.getAttachmentsForTask(taskId), - caldavTasks, - vtodoCache.getVtodo( caldavTasks.firstOrNull { !it.isDeleted() }) - )) + task = task, + alarms = alarmDao.getAlarms(taskId), + geofences = locationDao.getGeofencesForTask(taskId), + tags = tagDao.getTagsForTask(taskId), + comments = userActivityDao.getComments(taskId), + attachments = taskAttachmentDao.getAttachmentsForTask(taskId), + caldavTasks = caldavTasks, + vtodo = vtodoCache.getVtodo(caldavTasks.firstOrNull { !it.isDeleted() }) + ) + ) } val data = JsonObject( mapOf(