Skip to content

Commit 5299afe

Browse files
authored
fix: default to "Confirmed" when event status is missing or null (#762)
Android defaults to Tentative, and that isn't desirable as per #761 Refs: http://github.com/FossifyOrg/Calendar/issues/761
1 parent 9484647 commit 5299afe

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Changed
9+
- Synchronized events with unspecified status are now treated as confirmed ([#761])
10+
811
### Fixed
912
- Fixed editing only the selected occurrence of a repeating event ([#138], [#486], [#706])
1013

@@ -138,6 +141,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
138141
[#706]: https://github.com/FossifyOrg/Calendar/issues/706
139142
[#729]: https://github.com/FossifyOrg/Calendar/issues/729
140143
[#732]: https://github.com/FossifyOrg/Calendar/issues/732
144+
[#761]: http://github.com/FossifyOrg/Calendar/issues/761
141145

142146
[Unreleased]: https://github.com/FossifyOrg/Calendar/compare/1.6.1...HEAD
143147
[1.6.1]: https://github.com/FossifyOrg/Calendar/compare/1.6.0...1.6.1

app/src/main/kotlin/org/fossify/calendar/helpers/CalDAVHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ class CalDAVHelper(val context: Context) {
242242
val attendees = getCalDAVEventAttendees(id, calendar)
243243
val accessLevel = cursor.getIntValue(Events.ACCESS_LEVEL)
244244
val availability = cursor.getIntValue(Events.AVAILABILITY)
245-
val status = cursor.getIntValue(Events.STATUS)
245+
val status = cursor.getIntValueOrNull(Events.STATUS) ?: Events.STATUS_CONFIRMED
246246
val color = cursor.getIntValueOrNull(Events.EVENT_COLOR) ?: 0
247247

248248
if (endTS == 0L) {

0 commit comments

Comments
 (0)