Fix migrations

Author: rfc2822

app/src/androidTest/kotlin/at/bitfire/davdroid/settings/migration/AccountSettingsMigration20Test.kt

@@ -127,16 +127,16 @@ class AccountSettingsMigration20Test {
                     Calendars.NAME to url,
                     Calendars.SYNC_EVENTS to 1
                 )
-            )!!
+            )!!.asSyncAdapter(account)
             try {
-                migration.migrateCalendars(account, calDavServiceId = 1)
+                migration.migrateCalendars(account, 1)
 
-                provider.query(uri.asSyncAdapter(account), arrayOf(Calendars._SYNC_ID), null, null, null)!!.use { cursor ->
+                provider.query(uri, arrayOf(Calendars._SYNC_ID), null, null, null)!!.use { cursor ->
                     cursor.moveToNext()
                     assertEquals(collectionId, cursor.getLongOrNull(0))
                 }
             } finally {
-                provider.delete(uri.asSyncAdapter(account), null, null)
+                provider.delete(uri, null, null)
             }
         }
     }

app/src/main/kotlin/at/bitfire/davdroid/settings/migration/AccountSettingsMigration10.kt

@@ -46,7 +46,7 @@ class AccountSettingsMigration10 @Inject constructor(
         if (ContextCompat.checkSelfPermission(context, android.Manifest.permission.WRITE_CALENDAR) == PackageManager.PERMISSION_GRANTED)
             context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)?.use { provider ->
                 provider.update(
-                    CalendarContract.Calendars.CONTENT_URI.asSyncAdapter(account),
+                    Calendars.CONTENT_URI.asSyncAdapter(account),
                     contentValuesOf(
                         Calendars.ALLOWED_REMINDERS to arrayOf(
                             Reminders.METHOD_DEFAULT,

app/src/main/kotlin/at/bitfire/davdroid/settings/migration/AccountSettingsMigration20.kt

@@ -7,6 +7,7 @@ package at.bitfire.davdroid.settings.migration
 import android.accounts.Account
 import android.accounts.AccountManager
 import android.content.Context
+import android.provider.CalendarContract
 import androidx.annotation.OpenForTesting
 import androidx.core.content.contentValuesOf
 import at.bitfire.davdroid.db.Service
@@ -17,6 +18,7 @@ import at.bitfire.davdroid.resource.LocalCalendarStore
 import at.bitfire.davdroid.resource.LocalTaskList
 import at.bitfire.davdroid.sync.TasksAppManager
 import at.bitfire.ical4android.JtxCollection
+import at.bitfire.synctools.storage.calendar.AndroidCalendarProvider
 import at.techbee.jtx.JtxContract
 import dagger.Binds
 import dagger.Module
@@ -84,20 +86,18 @@ class AccountSettingsMigration20 @Inject constructor(
         } catch (_: SecurityException) {
             // no contacts permission
             null
-        }?.use { provider ->
-            // FIXME
-            /*for (calendar in calendarStore.getAll(account, provider))
-                provider.query(calendar.androidCalendar.calendarSyncURI(), arrayOf(Calendars.NAME), null, null, null)?.use { cursor ->
-                    if (cursor.moveToFirst())
-                        cursor.getString(0)?.let { url ->
-                            collectionRepository.getByServiceAndUrl(calDavServiceId, url)?.let { collection ->
-                                calendar.androidCalendar.update(
-                                    contentValuesOf(
-                                    Calendars._SYNC_ID to collection.id
-                                ))
-                            }
-                        }
-                }*/
+        }?.use { client ->
+            val calendarProvider = AndroidCalendarProvider(account, client)
+            // for each calendar, assign _SYNC_ID := ID if collection (identified by NAME field = URL)
+            for (calendar in calendarProvider.findCalendars()) {
+                val url = calendar.name ?: continue
+                collectionRepository.getByServiceAndUrl(calDavServiceId, url)?.let { collection ->
+                    calendar.update(contentValuesOf(
+                        CalendarContract.Calendars._SYNC_ID to collection.id
+                    ))
+                }
+
+            }
         }
     }
 

app/src/main/kotlin/at/bitfire/davdroid/settings/migration/AccountSettingsMigration7.kt

@@ -10,6 +10,7 @@ import android.content.Context
 import android.provider.CalendarContract
 import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.sync.account.setAndVerifyUserData
+import at.bitfire.synctools.storage.calendar.AndroidCalendarProvider
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -25,9 +26,9 @@ class AccountSettingsMigration7 @Inject constructor(
 
     override fun migrate(account: Account) {
         // add calendar colors
-        context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)?.use { provider ->
-            // FIXME
-            //AndroidCalendar.insertColors(provider, account)
+        context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)?.use { client ->
+            val provider = AndroidCalendarProvider(account, client)
+            provider.provideCss3ColorIndices()
         }
 
         // update allowed WiFi settings key

app/src/test/kotlin/at/bitfire/davdroid/log/StringHandlerTest.kt

@@ -4,7 +4,8 @@
 
 package at.bitfire.davdroid.log
 
-import org.junit.Assert
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import java.util.logging.Formatter
 import java.util.logging.Level
@@ -18,8 +19,8 @@ class StringHandlerTest {
         handler.publish(LogRecord(Level.INFO, "Line 1"))
         handler.publish(LogRecord(Level.FINEST, "Line 2"))
         val str = handler.toString()
-        Assert.assertTrue(str.contains("Line 1\n"))
-        Assert.assertTrue(str.contains("Line 2\n"))
+        assertTrue(str.contains("Line 1\n"))
+        assertTrue(str.contains("Line 2\n"))
     }
 
     @Test
@@ -33,8 +34,8 @@ class StringHandlerTest {
         handler.publish(LogRecord(Level.FINEST, "Line 2"))
 
         val str = handler.toString()
-        Assert.assertEquals(10, handler.toString().length)
-        Assert.assertEquals("Line [...]", str)
+        assertEquals(10, handler.toString().length)
+        assertEquals("Line [...]", str)
     }
 
 }

gradle/libs.versions.toml

@@ -20,7 +20,7 @@ androidx-test-junit = "1.2.1"
 androidx-work = "2.10.2"
 bitfire-cert4android = "b67ba86d31"
 bitfire-dav4jvm = "acbfbacbaf"
-bitfire-synctools = "db41886753"
+bitfire-synctools = "7d75c78e82"
 compose-accompanist = "0.37.3"
 compose-bom = "2025.06.01"
 dnsjava = "3.6.3"