[WIP] InitCalendarProviderRule

Author: rfc2822

lib/src/androidTest/kotlin/at/bitfire/ical4android/impl/TestCalendar.kt

@@ -9,7 +9,6 @@ package at.bitfire.ical4android.impl
 import android.accounts.Account
 import android.content.ContentProviderClient
 import android.provider.CalendarContract.Calendars
-import android.provider.CalendarContract.Reminders
 import androidx.core.content.contentValuesOf
 import at.bitfire.synctools.storage.calendar.AndroidCalendar
 import at.bitfire.synctools.storage.calendar.AndroidCalendarProvider
@@ -30,7 +29,7 @@ object TestCalendar {
             ?: provider.createAndGetCalendar(contentValuesOf(
                 Calendars.NAME to UUID.randomUUID().toString(),
                 Calendars.CALENDAR_DISPLAY_NAME to "ical4android Test Calendar",
-                Calendars.ALLOWED_REMINDERS to Reminders.METHOD_DEFAULT)
+                Calendars.CALENDAR_ACCESS_LEVEL to Calendars.CAL_ACCESS_ROOT)
             )
     }
 

lib/src/androidTest/kotlin/at/bitfire/synctools/storage/calendar/AndroidCalendarTest.kt

@@ -369,6 +369,11 @@ class AndroidCalendarTest {
 
     @Test
     fun testNumInstances_RecurringWithExceptions_MatchingOrigInstanceTime() {
+        // TODO: Fails when
+        // 1) Force-stop calendar storage
+        // 2) Clear calendar storage
+        // 3) Run this this class
+
         val syncId = "recurring-with-exceptions"
         val id = calendar.addEvent(Entity(contentValuesOf(
             Events.CALENDAR_ID to calendar.id,

lib/src/main/kotlin/at/bitfire/synctools/test/InitCalendarProviderRule.kt

@@ -10,7 +10,6 @@ import android.Manifest
 import android.accounts.Account
 import android.content.ContentProviderClient
 import android.content.Entity
-import android.os.Build
 import android.provider.CalendarContract
 import android.provider.CalendarContract.Calendars
 import android.provider.CalendarContract.Events
@@ -53,8 +52,7 @@ class InitCalendarProviderRule private constructor() : ExternalResource() {
     override fun before() {
         if (!isInitialized) {
             logger.info("Initializing calendar provider")
-            if (Build.VERSION.SDK_INT < 31)
-                logger.warning("Calendar provider initialization may or may not work. See InitCalendarProviderRule")
+            logger.warning("Calendar provider initialization may or may not work. See InitCalendarProviderRule")
 
             val context = InstrumentationRegistry.getInstrumentation().targetContext
             val client = context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)
@@ -84,18 +82,25 @@ class InitCalendarProviderRule private constructor() : ExternalResource() {
             val normalLocalEventId = calendar.addEvent(Entity(contentValuesOf(
                 Events.CALENDAR_ID to calendar.id,
                 Events.DTSTART to 1752075270000,
+                Events.DURATION to "PT1H",
                 Events.TITLE to "Event with 1 instance"
             )))
             calendar.numInstances(normalLocalEventId)
 
             // recurring event init
             val recurringEventId = calendar.addEvent(Entity(contentValuesOf(
                 Events.CALENDAR_ID to calendar.id,
-                Events.DTSTART to 1752075410000,
+                Events.DTSTART to 1752075410000,    // Wed Jul 09 2025 15:36:50 GMT
+                Events.DURATION to "PT1H",
                 Events.TITLE to "Event over 22 years",
                 Events.RRULE to "FREQ=YEARLY;UNTIL=20740119T010203Z"
             )))
-            calendar.numInstances(recurringEventId)
+            calendar.numInstances(recurringEventId)     // 49
+
+            calendar.client.update(CalendarContract.CalendarCache.URI, contentValuesOf(
+                CalendarContract.CalendarCache.KEY to CalendarContract.CalendarCache.KEY_TIMEZONE_TYPE,
+                CalendarContract.CalendarCache.VALUE to CalendarContract.CalendarCache.TIMEZONE_TYPE_AUTO,
+            ),"${CalendarContract.CalendarCache.KEY}=?", arrayOf(CalendarContract.CalendarCache.KEY_TIMEZONE_TYPE))
         } finally {
             calendar.delete()
         }