Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MKCALENDAR: send VTIMEZONE in calendar-timezone #1044

Merged
merged 22 commits into from
Oct 8, 2024
Merged

MKCALENDAR: send VTIMEZONE in calendar-timezone #1044

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ffdae09
Upgrade dav4jvm
ArnyminerZ Sep 25, 2024
a3644ef
separate CalendarTimezone and CalendarTimezoneId
ArnyminerZ Sep 25, 2024
6c4561a
Fixed timezone name setting
ArnyminerZ Sep 25, 2024
d05801a
Fixed `VTIMEZONE` conversion
ArnyminerZ Sep 25, 2024
4d38e08
Using text instead of CDATA
ArnyminerZ Sep 25, 2024
2423717
Fixed spec
ArnyminerZ Sep 30, 2024
967e594
Added comment
ArnyminerZ Oct 2, 2024
816bcb2
Renamed `timezoneDef` to `timezoneId`
ArnyminerZ Oct 2, 2024
f973859
Upgrade dav4jvm
ArnyminerZ Sep 25, 2024
ea262b5
separate CalendarTimezone and CalendarTimezoneId
ArnyminerZ Sep 25, 2024
bcc0595
Fixed timezone name setting
ArnyminerZ Sep 25, 2024
e7a2a7e
Fixed `VTIMEZONE` conversion
ArnyminerZ Sep 25, 2024
7729dca
Using text instead of CDATA
ArnyminerZ Sep 25, 2024
7da9c38
Fixed spec
ArnyminerZ Sep 30, 2024
201b896
Added comment
ArnyminerZ Oct 2, 2024
e958378
Renamed `timezoneDef` to `timezoneId`
ArnyminerZ Oct 2, 2024
ba259b6
[CI] Update workflows to Java 21
rfc2822 Oct 2, 2024
62b6cc0
Merge branch 'main-ose' into 1031-mkcalendar-send-vtimezone-in-calend…
ArnyminerZ Oct 2, 2024
b28f530
Merge remote-tracking branch 'origin/1031-mkcalendar-send-vtimezone-i…
ArnyminerZ Oct 2, 2024
d232d7f
Merge branch 'main-ose' into 1031-mkcalendar-send-vtimezone-in-calend…
rfc2822 Oct 3, 2024
bd4364a
Merge branch 'main-ose' into 1031-mkcalendar-send-vtimezone-in-calend…
rfc2822 Oct 7, 2024
2c07158
Set default value of the timezone state to null
ArnyminerZ Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Renamed timezoneDef to timezoneId 
Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me>
  • Loading branch information
@ArnyminerZ
ArnyminerZ committed Oct 2, 2024
commit 816bcb2e91ec5a2f88fb52982ed2c281f3aef9de
15 changes: 7 additions & 8 deletions app/src/main/kotlin/at/bitfire/davdroid/repository/DavCollectionRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class DavCollectionRepository @Inject constructor(
displayName = displayName,
description = description,
color = color,
timezoneDef = timeZoneId,
timezoneId = timeZoneId,
supportsVEVENT = supportVEVENT,
supportsVTODO = supportVTODO,
supportsVJOURNAL = supportVJOURNAL
Expand Down Expand Up @@ -291,7 +291,7 @@ class DavCollectionRepository @Inject constructor(
displayName: String?,
description: String?,
color: Int? = null,
timezoneDef: String? = null,
timezoneId: String? = null,
supportsVEVENT: Boolean = true,
supportsVTODO: Boolean = true,
supportsVJOURNAL: Boolean = true
Expand Down Expand Up @@ -347,15 +347,15 @@ class DavCollectionRepository @Inject constructor(
text(DavUtils.ARGBtoCalDAVColor(it))
}
}
timezoneDef?.let { timezoneId ->
timezoneId?.let { id ->
insertTag(CalendarTimezoneId.NAME) {
text(timezoneId)
text(id)
}
getVTimeZone(timezoneId)?.let {
getVTimeZone(id)?.let { vTimezone ->
insertTag(CalendarTimezone.NAME) {
text(
// spec requires "an iCalendar object with exactly one VTIMEZONE component"
Calendar(ComponentList(listOf(it))).toString()
Calendar(ComponentList(listOf(vTimezone))).toString()
)
}
}
Expand Down Expand Up @@ -391,8 +391,7 @@ class DavCollectionRepository @Inject constructor(
return writer.toString()
}

private fun getVTimeZone(tzId: String): VTimeZone? =
DateUtils.ical4jTimeZone(tzId)?.vTimeZone
private fun getVTimeZone(tzId: String): VTimeZone? = DateUtils.ical4jTimeZone(tzId)?.vTimeZone


/*** OBSERVERS ***/
Expand Down
Loading