Skip to content

Additions needed for updating ICSx⁵ #169

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

Draft
sunkup wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Additions needed for updating ICSx⁵ #169

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d10d516
Add lastModified field from ICSx5 LocalEvent
sunkup Jan 13, 2026
4154d36
Explicit `PRODID` handling (#19)
rfc2822 Jun 26, 2025
9db5cb5
Remove possibility to subclass AndroidEvent (#20)
rfc2822 Jun 27, 2025
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
13 changes: 13 additions & 0 deletions lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import net.fortuna.ical4j.model.property.DtEnd
import net.fortuna.ical4j.model.property.DtStart
import net.fortuna.ical4j.model.property.ExDate
import net.fortuna.ical4j.model.property.ExRule
import net.fortuna.ical4j.model.property.LastModified
import net.fortuna.ical4j.model.property.Organizer
import net.fortuna.ical4j.model.property.RDate
import net.fortuna.ical4j.model.property.RRule
Expand Down Expand Up @@ -98,6 +99,7 @@ open class AndroidEvent(
var eTag: String? = null
var scheduleTag: String? = null
var flags: Int = 0
var lastModified: Long = 0L

/**
* Creates a new object from an event which already exists in the calendar storage.
Expand All @@ -110,6 +112,7 @@ open class AndroidEvent(
this.eTag = values.getAsString(COLUMN_ETAG)
this.scheduleTag = values.getAsString(COLUMN_SCHEDULE_TAG)
this.flags = values.getAsInteger(COLUMN_FLAGS) ?: 0
this.lastModified = values.getAsLong(COLUMN_LAST_MODIFIED) ?: 0L
}

/**
Expand All @@ -122,6 +125,7 @@ open class AndroidEvent(
this.eTag = eTag
this.scheduleTag = scheduleTag
this.flags = flags
this.lastModified = event.lastModified?.dateTime?.time ?: 0L
}

private var _event: Event? = null
Expand Down Expand Up @@ -318,6 +322,9 @@ open class AndroidEvent(
event.uid = row.getAsString(Events.UID_2445)
event.sequence = row.getAsInteger(COLUMN_SEQUENCE)
event.isOrganizer = row.getAsBoolean(Events.IS_ORGANIZER)
event.lastModified = row.getAsLong(COLUMN_LAST_MODIFIED)?.let { time ->
LastModified(DateTime(time))
}

event.summary = row.getAsString(Events.TITLE)
event.location = row.getAsString(Events.EVENT_LOCATION)
Expand Down Expand Up @@ -800,6 +807,7 @@ open class AndroidEvent(
builder.withValue(Events._SYNC_ID, syncId)
.withValue(COLUMN_ETAG, eTag)
.withValue(COLUMN_SCHEDULE_TAG, scheduleTag)
.withValue(COLUMN_LAST_MODIFIED, lastModified)
else
builder.withValue(Events.ORIGINAL_SYNC_ID, syncId)

Expand Down Expand Up @@ -1154,6 +1162,11 @@ open class AndroidEvent(
*/
const val COLUMN_SCHEDULE_TAG = Events.SYNC_DATA4

/**
* Custom sync column to store the last modified value of an event.
*/
const val COLUMN_LAST_MODIFIED = Events.SYNC_DATA5

/**
* VEVENT CATEGORIES are stored as an extended property with this [ExtendedProperties.NAME].
*
Expand Down