Don't crash on missing vtodo value

pull/2906/head
Alex Baker 1 month ago
parent 4a2fb13d10
commit 2fc6833854

@ -48,7 +48,7 @@ class BackupContainer(
val comments: List<UserActivity>, val comments: List<UserActivity>,
val attachments: List<Attachment>?, val attachments: List<Attachment>?,
val caldavTasks: List<CaldavTask>?, val caldavTasks: List<CaldavTask>?,
val vtodo: String?, val vtodo: String? = null,
val google: List<GoogleTask> = emptyList(), val google: List<GoogleTask> = emptyList(),
) { ) {
val locations: List<LegacyLocation> = emptyList() val locations: List<LegacyLocation> = emptyList()

@ -125,15 +125,16 @@ class TasksJsonExporter @Inject constructor(
val caldavTasks = caldavDao.getTasks(taskId) val caldavTasks = caldavDao.getTasks(taskId)
taskBackups.add( taskBackups.add(
TaskBackup( TaskBackup(
task, task = task,
alarmDao.getAlarms(taskId), alarms = alarmDao.getAlarms(taskId),
locationDao.getGeofencesForTask(taskId), geofences = locationDao.getGeofencesForTask(taskId),
tagDao.getTagsForTask(taskId), tags = tagDao.getTagsForTask(taskId),
userActivityDao.getComments(taskId), comments = userActivityDao.getComments(taskId),
taskAttachmentDao.getAttachmentsForTask(taskId), attachments = taskAttachmentDao.getAttachmentsForTask(taskId),
caldavTasks, caldavTasks = caldavTasks,
vtodoCache.getVtodo( caldavTasks.firstOrNull { !it.isDeleted() }) vtodo = vtodoCache.getVtodo(caldavTasks.firstOrNull { !it.isDeleted() })
)) )
)
} }
val data = JsonObject( val data = JsonObject(
mapOf( mapOf(

Loading…
Cancel
Save