Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Events shown in adjacent months are no longer dimmed ([#808])

### Fixed
- Fixed missing email notifications for attendees in some cases ([#135])
- Fixed missing attendees list when using some specific providers ([#818])

## [1.6.2] - 2025-10-09
### Changed
- Synchronized events with unspecified status are now treated as confirmed ([#761])
Expand Down Expand Up @@ -135,6 +139,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

[#34]: https://github.com/FossifyOrg/Calendar/issues/34
[#49]: https://github.com/FossifyOrg/Calendar/issues/49
[#135]: https://github.com/FossifyOrg/Calendar/issues/135
[#138]: https://github.com/FossifyOrg/Calendar/issues/138
[#148]: https://github.com/FossifyOrg/Calendar/issues/148
[#196]: https://github.com/FossifyOrg/Calendar/issues/196
Expand All @@ -156,6 +161,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#732]: https://github.com/FossifyOrg/Calendar/issues/732
[#761]: https://github.com/FossifyOrg/Calendar/issues/761
[#808]: https://github.com/FossifyOrg/Calendar/issues/808
[#818]: https://github.com/FossifyOrg/Calendar/issues/818

[Unreleased]: https://github.com/FossifyOrg/Calendar/compare/1.6.2...HEAD
[1.6.2]: https://github.com/FossifyOrg/Calendar/compare/1.6.1...1.6.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2361,12 +2361,27 @@ class EventActivity : SimpleActivity() {
if (mEvent.id == null && isSavingEvent && attendees.isNotEmpty()) {
val currentCalendar =
calDAVHelper.getCalDAVCalendars("", true).firstOrNull { it.id == mEventCalendarId }
mAvailableContacts.firstOrNull { it.email == currentCalendar?.ownerName }?.apply {
attendees = attendees.filter { it.email != currentCalendar?.ownerName }
.toMutableList() as ArrayList<Attendee>
status = Attendees.ATTENDEE_STATUS_ACCEPTED
relationship = Attendees.RELATIONSHIP_ORGANIZER
attendees.add(this)
val organizerEmail = currentCalendar?.ownerName
val organizer = mAvailableContacts.firstOrNull { it.email.equals(organizerEmail, true) }
attendees = attendees
.filter { !it.email.equals(organizerEmail, true) }
.toMutableList() as ArrayList<Attendee>
if (organizer != null) {
organizer.status = Attendees.ATTENDEE_STATUS_ACCEPTED
organizer.relationship = Attendees.RELATIONSHIP_ORGANIZER
attendees.add(organizer)
} else if (!organizerEmail.isNullOrBlank()) {
attendees.add(
Attendee(
contactId = 0,
name = "",
email = organizerEmail,
status = Attendees.ATTENDEE_STATUS_ACCEPTED,
photoUri = "",
isMe = true,
relationship = Attendees.RELATIONSHIP_ORGANIZER
)
)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,15 @@ class CalDAVHelper(val context: Context) {
put(Attendees.ATTENDEE_NAME, it.name)
put(Attendees.ATTENDEE_EMAIL, it.email)
put(Attendees.ATTENDEE_STATUS, it.status)
put(Attendees.ATTENDEE_RELATIONSHIP, it.relationship)
put(
Attendees.ATTENDEE_RELATIONSHIP,
if (it.relationship == Attendees.RELATIONSHIP_ORGANIZER) {
it.relationship
} else {
Attendees.RELATIONSHIP_ATTENDEE
}
)
put(Attendees.ATTENDEE_TYPE, Attendees.TYPE_REQUIRED)
put(Attendees.EVENT_ID, event.getCalDAVEventId())
}

Expand Down
Loading