mirror of
https://github.com/bitfireAT/davx5-ose.git
synced 2026-02-02 19:21:09 -05:00
Compare commits
2 Commits
main-ose
...
synctools-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a0b48eb42e | ||
|
|
a1d8e920c1 |
@@ -27,6 +27,8 @@ import at.bitfire.davdroid.util.DavUtils
|
||||
import at.bitfire.davdroid.util.DavUtils.lastSegment
|
||||
import at.bitfire.ical4android.DmfsTask
|
||||
import at.bitfire.ical4android.Task
|
||||
import at.bitfire.ical4android.TaskReader
|
||||
import at.bitfire.ical4android.TaskWriter
|
||||
import at.bitfire.synctools.exception.InvalidICalendarException
|
||||
import dagger.assisted.Assisted
|
||||
import dagger.assisted.AssistedFactory
|
||||
@@ -37,9 +39,9 @@ import net.fortuna.ical4j.model.property.ProdId
|
||||
import okhttp3.HttpUrl
|
||||
import okhttp3.OkHttpClient
|
||||
import okhttp3.RequestBody.Companion.toRequestBody
|
||||
import java.io.ByteArrayOutputStream
|
||||
import java.io.Reader
|
||||
import java.io.StringReader
|
||||
import java.io.StringWriter
|
||||
import java.util.logging.Level
|
||||
|
||||
/**
|
||||
@@ -116,12 +118,13 @@ class TasksSyncManager @AssistedInject constructor(
|
||||
}
|
||||
|
||||
// generate iCalendar and convert to request body
|
||||
val os = ByteArrayOutputStream()
|
||||
task.write(os, ProdId(Constants.iCalProdId))
|
||||
val icalWriter = StringWriter()
|
||||
val taskWriter = TaskWriter(ProdId(Constants.iCalProdId))
|
||||
taskWriter.write(task, icalWriter)
|
||||
|
||||
return GeneratedResource(
|
||||
suggestedFileName = DavUtils.fileNameFromUid(uid, "ics"),
|
||||
requestBody = os.toByteArray().toRequestBody(DavCalendar.MIME_ICALENDAR_UTF8)
|
||||
requestBody = icalWriter.toString().toRequestBody(DavCalendar.MIME_ICALENDAR_UTF8)
|
||||
)
|
||||
}
|
||||
|
||||
@@ -168,12 +171,13 @@ class TasksSyncManager @AssistedInject constructor(
|
||||
logger.info("Touched $touched relations")
|
||||
}
|
||||
|
||||
|
||||
// helpers
|
||||
|
||||
private fun processVTodo(fileName: String, eTag: String, reader: Reader) {
|
||||
val tasks: List<Task>
|
||||
try {
|
||||
tasks = Task.tasksFromReader(reader)
|
||||
tasks = TaskReader().readTasks(reader)
|
||||
} catch (e: InvalidICalendarException) {
|
||||
logger.log(Level.SEVERE, "Received invalid iCalendar, ignoring", e)
|
||||
notifyInvalidResource(e, fileName)
|
||||
|
||||
@@ -20,7 +20,7 @@ androidx-test-junit = "1.3.0"
|
||||
androidx-work = "2.11.0"
|
||||
bitfire-cert4android = "75cc6913fd"
|
||||
bitfire-dav4jvm = "acf8e4ef9b"
|
||||
bitfire-synctools = "ee1b4b0933"
|
||||
bitfire-synctools = "a2eada8d94"
|
||||
compose-accompanist = "0.37.3"
|
||||
compose-bom = "2026.01.00"
|
||||
conscrypt = "2.5.3"
|
||||
|
||||
Reference in New Issue
Block a user