MKCALENDAR: send VTIMEZONE in calendar-timezone

app/src/main/kotlin/at/bitfire/davdroid/repository/DavCollectionRepository.kt

@@ -12,6 +12,7 @@ import at.bitfire.dav4jvm.XmlUtils.insertTag
 import at.bitfire.dav4jvm.property.caldav.CalendarColor
 import at.bitfire.dav4jvm.property.caldav.CalendarDescription
 import at.bitfire.dav4jvm.property.caldav.CalendarTimezone
+import at.bitfire.dav4jvm.property.caldav.CalendarTimezoneId
 import at.bitfire.dav4jvm.property.caldav.NS_CALDAV
 import at.bitfire.dav4jvm.property.caldav.SupportedCalendarComponentSet
 import at.bitfire.dav4jvm.property.carddav.AddressbookDescription
@@ -33,15 +34,18 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import dagger.multibindings.Multibinds
+import java.io.StringWriter
+import java.util.Collections
+import java.util.UUID
+import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.withContext
+import net.fortuna.ical4j.model.Calendar
 import net.fortuna.ical4j.model.Component
+import net.fortuna.ical4j.model.ComponentList
+import net.fortuna.ical4j.model.component.VTimeZone
 import okhttp3.HttpUrl
-import java.io.StringWriter
-import java.util.Collections
-import java.util.UUID
-import javax.inject.Inject
 
 /**
  * Repository for managing collections.
@@ -147,7 +151,7 @@ class DavCollectionRepository @Inject constructor(
             displayName = displayName,
             description = description,
             color = color,
-            timezone = timeZoneId?.let { getVTimeZone(it) },
+            timezone = timeZoneId?.let { getVTimeZone(it)?.toString() },
             supportsVEVENT = supportVEVENT,
             supportsVTODO = supportVTODO,
             supportsVJOURNAL = supportVJOURNAL
@@ -343,9 +347,16 @@ class DavCollectionRepository @Inject constructor(
                                 text(DavUtils.ARGBtoCalDAVColor(it))
                             }
                         }
-                        timezoneDef?.let {
-                            insertTag(CalendarTimezone.NAME) {
-                                cdsect(it)
+                        timezoneDef?.let { timezoneId ->
+                            insertTag(CalendarTimezoneId.NAME) {
+                                text(timezoneId)
+                            }
+                            getVTimeZone(timezoneId)?.let {
+                                insertTag(CalendarTimezone.NAME) {
+                                    text(
+                                        Calendar(ComponentList(listOf(it))).toString()
+                                    )
+                                }
                             }
                         }
 
@@ -379,8 +390,8 @@ class DavCollectionRepository @Inject constructor(
         return writer.toString()
     }
 
-    private fun getVTimeZone(tzId: String): String? =
-        DateUtils.ical4jTimeZone(tzId)?.toString()
+    private fun getVTimeZone(tzId: String): VTimeZone? =
+        DateUtils.ical4jTimeZone(tzId)?.vTimeZone
 
 
     /*** OBSERVERS ***/

gradle/libs.versions.toml

@@ -19,7 +19,7 @@ androidx-test-rules = "1.6.1"
 androidx-test-junit = "1.2.1"
 androidx-work = "2.9.1"
 bitfire-cert4android = "f1cc9b9ca3"
-bitfire-dav4jvm = "c1bc143488"
+bitfire-dav4jvm = "fbd95a5f5a"
 bitfire-ical4android = "b75f33972a"
 bitfire-vcard4android = "505848a85a"
 compose-accompanist = "0.36.0"