archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use non-blocking daos in iCalendar

Browse Source
pull/1052/head
Alex Baker 4 years ago
parent 91a99429ae
commit 5b8256d65e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

22
app/src/main/java/org/tasks/caldav/iCalendar.kt
Unescape Escape View File

@ -3,7 +3,7 @@ package org.tasks.caldav
import at.bitfire.ical4android.Task import at.bitfire.ical4android.Task
import at.bitfire.ical4android.Task.Companion.tasksFromReader import at.bitfire.ical4android.Task.Companion.tasksFromReader
import com.todoroo.andlib.utility.DateUtilities import com.todoroo.andlib.utility.DateUtilities
import com.todoroo.astrid.dao.TaskDaoBlocking import com.todoroo.astrid.dao.TaskDao
import com.todoroo.astrid.helper.UUIDHelper import com.todoroo.astrid.helper.UUIDHelper
import com.todoroo.astrid.service.TaskCreator import com.todoroo.astrid.service.TaskCreator
import net.fortuna.ical4j.model.Parameter import net.fortuna.ical4j.model.Parameter
@ -27,15 +27,15 @@ import javax.inject.Inject
@Suppress("ClassName") @Suppress("ClassName")
class iCalendar @Inject constructor( class iCalendar @Inject constructor(
private val tagDataDao: TagDataDaoBlocking, private val tagDataDao: TagDataDao,
private val preferences: Preferences, private val preferences: Preferences,
private val locationDao: LocationDaoBlocking, private val locationDao: LocationDao,
private val workManager: WorkManager, private val workManager: WorkManager,
private val geofenceApi: GeofenceApi, private val geofenceApi: GeofenceApi,
private val taskCreator: TaskCreator, private val taskCreator: TaskCreator,
private val tagDao: TagDaoBlocking, private val tagDao: TagDao,
private val taskDao: TaskDaoBlocking, private val taskDao: TaskDao,
private val caldavDao: CaldavDaoBlocking) { private val caldavDao: CaldavDao) {
companion object { companion object {
private const val APPLE_SORT_ORDER = "X-APPLE-SORT-ORDER" private const val APPLE_SORT_ORDER = "X-APPLE-SORT-ORDER"
@ -98,7 +98,7 @@ class iCalendar @Inject constructor(
} }
} }
fun setPlace(taskId: Long, geo: Geo) { suspend fun setPlace(taskId: Long, geo: Geo) {
var place: Place? = locationDao.findPlace( var place: Place? = locationDao.findPlace(
geo.latitude.toLikeString(), geo.latitude.toLikeString(),
geo.longitude.toLikeString()) geo.longitude.toLikeString())
@ -121,7 +121,7 @@ class iCalendar @Inject constructor(
geofenceApi.update(place) geofenceApi.update(place)
} }
fun getTags(categories: List<String>): List<TagData> { suspend fun getTags(categories: List<String>): List<TagData> {
if (categories.isEmpty()) { if (categories.isEmpty()) {
return emptyList() return emptyList()
} }
@ -136,7 +136,7 @@ class iCalendar @Inject constructor(
return tags return tags
} }
fun toVtodo(caldavTask: CaldavTask, task: com.todoroo.astrid.data.Task): ByteArray { suspend fun toVtodo(caldavTask: CaldavTask, task: com.todoroo.astrid.data.Task): ByteArray {
val remoteModel = CaldavConverter.toCaldav(caldavTask, task) val remoteModel = CaldavConverter.toCaldav(caldavTask, task)
remoteModel.order = caldavTask.order remoteModel.order = caldavTask.order
val categories = remoteModel.categories val categories = remoteModel.categories
@ -160,7 +160,7 @@ class iCalendar @Inject constructor(
return os.toByteArray() return os.toByteArray()
} }
fun fromVtodo( suspend fun fromVtodo(
calendar: CaldavCalendar, calendar: CaldavCalendar,
existing: CaldavTask?, existing: CaldavTask?,
remote: Task, remote: Task,
@ -174,7 +174,7 @@ class iCalendar @Inject constructor(
taskDao.createNew(task) taskDao.createNew(task)
caldavTask = CaldavTask(task.id, calendar.uuid, remote.uid, obj) caldavTask = CaldavTask(task.id, calendar.uuid, remote.uid, obj)
} else { } else {
task = taskDao.fetchBlocking(existing.task)!! task = taskDao.fetch(existing.task)!!
caldavTask = existing caldavTask = existing
} }
CaldavConverter.apply(task, remote) CaldavConverter.apply(task, remote)

Write Preview
Loading…
Cancel
Save