From 1ecb919bae58b36591ea21c9d0ac7540dbce0951 Mon Sep 17 00:00:00 2001 From: Ricki Hirner <hirner@bitfire.at> Date: Sun, 24 Nov 2024 15:38:59 +0100 Subject: [PATCH] AndroidCalendar, JtxCollection: add syncId column --- .../kotlin/at/bitfire/ical4android/AndroidCalendarTest.kt | 2 +- .../main/kotlin/at/bitfire/ical4android/AndroidCalendar.kt | 4 ++++ lib/src/main/kotlin/at/bitfire/ical4android/JtxCollection.kt | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidCalendarTest.kt b/lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidCalendarTest.kt index 669de0c2..a9d5e1d8 100644 --- a/lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidCalendarTest.kt +++ b/lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidCalendarTest.kt @@ -125,4 +125,4 @@ class AndroidCalendarTest { } } -} +} \ No newline at end of file diff --git a/lib/src/main/kotlin/at/bitfire/ical4android/AndroidCalendar.kt b/lib/src/main/kotlin/at/bitfire/ical4android/AndroidCalendar.kt index f7ec09ed..1981dc9b 100644 --- a/lib/src/main/kotlin/at/bitfire/ical4android/AndroidCalendar.kt +++ b/lib/src/main/kotlin/at/bitfire/ical4android/AndroidCalendar.kt @@ -165,6 +165,8 @@ abstract class AndroidCalendar<out T: AndroidEvent>( var ownerAccount: String? = null + var syncId: String? = null + /** * Sets the calendar properties ([name], [displayName] etc.) from the passed argument, @@ -186,6 +188,8 @@ abstract class AndroidCalendar<out T: AndroidEvent>( isVisible = info.getAsInteger(Calendars.VISIBLE) != 0 ownerAccount = info.getAsString(Calendars.OWNER_ACCOUNT) + + syncId = info.getAsString(Calendars._SYNC_ID) } diff --git a/lib/src/main/kotlin/at/bitfire/ical4android/JtxCollection.kt b/lib/src/main/kotlin/at/bitfire/ical4android/JtxCollection.kt index 7e926d7a..c87b5a3d 100644 --- a/lib/src/main/kotlin/at/bitfire/ical4android/JtxCollection.kt +++ b/lib/src/main/kotlin/at/bitfire/ical4android/JtxCollection.kt @@ -60,6 +60,8 @@ open class JtxCollection<out T: JtxICalObject>(val account: Account, var supportsVTODO = true var supportsVJOURNAL = true + var syncId: Long? = null + var context: Context? = null @@ -85,6 +87,8 @@ open class JtxCollection<out T: JtxICalObject>(val account: Account, supportsVJOURNAL = values.getAsString(JtxContract.JtxCollection.SUPPORTSVJOURNAL) == "1" || values.getAsString(JtxContract.JtxCollection.SUPPORTSVJOURNAL) == "true" + syncId = values.getAsLong(JtxContract.JtxCollection.SYNC_ID) + this.context = context }