mirror/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose.git synced 2025-12-23 23:17:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update to synctools version that uses explicit parsing / splitting (#1554)"

Browse Source 
This reverts commit 5dbaedfa60.

Reason: we don't want it in 4.5.1 yet
This commit is contained in:
Ricki Hirner
2025-07-02 14:28:57 +02:00
parent 5dbaedfa60
commit f78e7868e8
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/at/bitfire/davdroid/sync/CalendarSyncManager.kt
View File

@@ -30,8 +30,8 @@ import at.bitfire.davdroid.settings.AccountSettings
import at.bitfire.davdroid.util.DavUtils.lastSegment
import at.bitfire.ical4android.AndroidEvent
import at.bitfire.ical4android.Event
import at.bitfire.ical4android.InvalidCalendarException
import at.bitfire.ical4android.util.DateUtils
import at.bitfire.synctools.exception.InvalidRemoteResourceException
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
@@ -256,7 +256,7 @@ class CalendarSyncManager @AssistedInject constructor(
val events: List<Event>
try {
events = Event.eventsFromReader(reader)
} catch (e: InvalidRemoteResourceException) {
} catch (e: InvalidCalendarException) {
logger.log(Level.SEVERE, "Received invalid iCalendar, ignoring", e)
notifyInvalidResource(e, fileName)
return

4
app/src/main/kotlin/at/bitfire/davdroid/sync/JtxSyncManager.kt
View File

@@ -26,8 +26,8 @@ import at.bitfire.davdroid.resource.LocalJtxCollection
import at.bitfire.davdroid.resource.LocalJtxICalObject
import at.bitfire.davdroid.resource.LocalResource
import at.bitfire.davdroid.util.DavUtils.lastSegment
import at.bitfire.ical4android.InvalidCalendarException
import at.bitfire.ical4android.JtxICalObject
import at.bitfire.synctools.exception.InvalidRemoteResourceException
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
@@ -167,7 +167,7 @@ class JtxSyncManager @AssistedInject constructor(
try {
// parse the reader content and return the list of ICalObjects
icalobjects.addAll(JtxICalObject.fromReader(reader, localCollection))
} catch (e: InvalidRemoteResourceException) {
} catch (e: InvalidCalendarException) {
logger.log(Level.SEVERE, "Received invalid iCalendar, ignoring", e)
notifyInvalidResource(e, fileName)
return

4
app/src/main/kotlin/at/bitfire/davdroid/sync/TasksSyncManager.kt
View File

@@ -25,8 +25,8 @@ import at.bitfire.davdroid.resource.LocalResource
import at.bitfire.davdroid.resource.LocalTask
import at.bitfire.davdroid.resource.LocalTaskList
import at.bitfire.davdroid.util.DavUtils.lastSegment
import at.bitfire.ical4android.InvalidCalendarException
import at.bitfire.ical4android.Task
import at.bitfire.synctools.exception.InvalidRemoteResourceException
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
@@ -161,7 +161,7 @@ class TasksSyncManager @AssistedInject constructor(
val tasks: List<Task>
try {
tasks = Task.tasksFromReader(reader)
} catch (e: InvalidRemoteResourceException) {
} catch (e: InvalidCalendarException) {
logger.log(Level.SEVERE, "Received invalid iCalendar, ignoring", e)
notifyInvalidResource(e, fileName)
return

2
gradle/libs.versions.toml
View File

@@ -20,7 +20,7 @@ androidx-test-junit = "1.2.1"
androidx-work = "2.10.2"
bitfire-cert4android = "b67ba86d31"
bitfire-dav4jvm = "acbfbacbaf"
bitfire-synctools = "7bd154b5be"
bitfire-synctools = "fb3c4d70ab"
compose-accompanist = "0.37.3"
compose-bom = "2025.06.01"
dnsjava = "3.6.3"