Skip to content

Fix/recurrence respect event timezone #1197

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

Open
kruggiero97 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix/recurrence respect event timezone #1197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aeb7636
fix: use event time zone when expanding recurring occurrences
kruggiero97 May 9, 2026
2772bf1
docs(changelog): note recurrence timezone fix
kruggiero97 May 9, 2026
948b923
refactor: extract timezone resolution into a helper, log unrecognized…
kruggiero97 May 9, 2026
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed event text readability on colored backgrounds ([#1065])
- Fixed invisible current time indicator in weekly view ([#99])
- Fixed stuck zoom level in weekly view on some devices ([#621])
- Fixed recurring events drifting by an hour after DST transitions ([#165])

## [1.10.3] - 2026-02-14
### Changed
Expand Down Expand Up @@ -217,6 +218,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#135]: https://github.com/FossifyOrg/Calendar/issues/135
[#138]: https://github.com/FossifyOrg/Calendar/issues/138
[#148]: https://github.com/FossifyOrg/Calendar/issues/148
[#165]: https://github.com/FossifyOrg/Calendar/issues/165
[#196]: https://github.com/FossifyOrg/Calendar/issues/196
[#217]: https://github.com/FossifyOrg/Calendar/issues/217
[#262]: https://github.com/FossifyOrg/Calendar/issues/262
Expand Down
17 changes: 16 additions & 1 deletion app/src/main/kotlin/org/fossify/calendar/models/Event.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package org.fossify.calendar.models

import android.provider.CalendarContract
import android.provider.CalendarContract.Attendees
import android.util.Log
import androidx.collection.LongSparseArray
import androidx.room.ColumnInfo
import androidx.room.Entity
Expand Down Expand Up @@ -74,7 +75,7 @@ data class Event(
}

fun addIntervalTime(original: Event) {
val oldStart = Formatter.getDateTimeFromTS(startTS)
val oldStart = Formatter.getDateTimeFromTS(startTS, resolveTimeZone())
val newStart = when (repeatInterval) {
DAY -> oldStart.plusDays(1)
else -> {
Expand Down Expand Up @@ -109,6 +110,20 @@ data class Event(
endTS = newEndTS
}

// Returns the event's time zone, or the device default if unset or unrecognized.
private fun resolveTimeZone(): DateTimeZone {
return if (timeZone.isNotEmpty()) {
try {
DateTimeZone.forID(timeZone)
} catch (e: IllegalArgumentException) {
Log.w("Event", "Unrecognized timezone '$timeZone', using default", e)
DateTimeZone.getDefault()
}
} else {
DateTimeZone.getDefault()
}
}

// if an event should happen on 29th Feb. with Same Day yearly repetition, show it only on leap years
private fun addYearsWithSameDay(currStart: DateTime): DateTime {
var newDateTime = currStart.plusYears(repeatInterval / YEAR)
Expand Down
Loading