Update dav4jvm, Kotlin

8 files changed, 18 insertions, 18 deletions

diff --git a/app/build.gradle b/app/build.gradle
index c2f6e70a..887b45be 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -115,7 +115,7 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.fragment:fragment-ktx:1.5.3'
+    implementation 'androidx.fragment:fragment-ktx:1.5.4'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
     implementation 'androidx.paging:paging-runtime-ktx:3.1.1'
diff --git a/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/TestSyncManager.kt b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/TestSyncManager.kt
index 6e664bed..0c146b63 100644
--- a/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/TestSyncManager.kt
+++ b/app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/TestSyncManager.kt
@@ -9,7 +9,7 @@ import android.content.Context
 import android.content.SyncResult
 import android.os.Bundle
 import at.bitfire.dav4jvm.DavCollection
-import at.bitfire.dav4jvm.DavResponseCallback
+import at.bitfire.dav4jvm.MultiResponseCallback
 import at.bitfire.dav4jvm.Response
 import at.bitfire.dav4jvm.property.GetCTag
 import at.bitfire.davdroid.DavUtils
@@ -67,12 +67,12 @@ class TestSyncManager(
 
     var listAllRemoteResult = emptyList<Pair<Response, Response.HrefRelation>>()
     var didListAllRemote = false
-    override fun listAllRemote(callback: DavResponseCallback) {
+    override fun listAllRemote(callback: MultiResponseCallback) {
         if (didListAllRemote)
             throw IllegalStateException("listAllRemote() must not be called twice")
         didListAllRemote = true
         for (result in listAllRemoteResult)
-            callback(result.first, result.second)
+            callback.onResponse(result.first, result.second)
     }
 
     var assertDownloadRemote = emptyMap<HttpUrl, String>()
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt
index c00239c7..a9434016 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt
@@ -9,7 +9,7 @@ import android.content.Context
 import android.content.SyncResult
 import android.os.Bundle
 import at.bitfire.dav4jvm.DavCalendar
-import at.bitfire.dav4jvm.DavResponseCallback
+import at.bitfire.dav4jvm.MultiResponseCallback
 import at.bitfire.dav4jvm.Response
 import at.bitfire.dav4jvm.exception.DavException
 import at.bitfire.dav4jvm.property.*
@@ -101,7 +101,7 @@ class CalendarSyncManager(
         os.toByteArray().toRequestBody(DavCalendar.MIME_ICALENDAR_UTF8)
     }
 
-    override fun listAllRemote(callback: DavResponseCallback) {
+    override fun listAllRemote(callback: MultiResponseCallback) {
         // calculate time range limits
         var limitStart: Date? = null
         accountSettings.getTimeRangePastDays()?.let { pastDays ->
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt
index 82e84f78..4df44fc9 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt
@@ -12,7 +12,7 @@ import android.content.SyncResult
 import android.os.Build
 import android.os.Bundle
 import at.bitfire.dav4jvm.DavAddressBook
-import at.bitfire.dav4jvm.DavResponseCallback
+import at.bitfire.dav4jvm.MultiResponseCallback
 import at.bitfire.dav4jvm.Response
 import at.bitfire.dav4jvm.exception.DavException
 import at.bitfire.dav4jvm.property.*
@@ -252,7 +252,7 @@ class ContactsSyncManager(
             return@localExceptionContext(os.toByteArray().toRequestBody(mimeType))
         }
 
-    override fun listAllRemote(callback: DavResponseCallback) =
+    override fun listAllRemote(callback: MultiResponseCallback) =
             remoteExceptionContext {
                 it.propfind(1, ResourceType.NAME, GetETag.NAME, callback = callback)
             }
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/JtxSyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/JtxSyncManager.kt
index 5ecdc496..f02b1f5f 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/JtxSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/JtxSyncManager.kt
@@ -9,7 +9,7 @@ import android.content.Context
 import android.content.SyncResult
 import android.os.Bundle
 import at.bitfire.dav4jvm.DavCalendar
-import at.bitfire.dav4jvm.DavResponseCallback
+import at.bitfire.dav4jvm.MultiResponseCallback
 import at.bitfire.dav4jvm.Response
 import at.bitfire.dav4jvm.exception.DavException
 import at.bitfire.dav4jvm.property.*
@@ -76,7 +76,7 @@ class JtxSyncManager(
 
     override fun syncAlgorithm() = SyncAlgorithm.PROPFIND_REPORT
 
-    override fun listAllRemote(callback: DavResponseCallback) {
+    override fun listAllRemote(callback: MultiResponseCallback) {
         remoteExceptionContext { remote ->
             if (localCollection.supportsVTODO) {
                 Logger.log.info("Querying tasks")
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
index 41c07d4c..6616f262 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
@@ -520,7 +520,7 @@ abstract class SyncManager<ResourceType: LocalResource<*>, out CollectionType: L
      *
      * @param listRemote function to list remote resources (for instance, all since a certain sync-token)
      */
-    protected open fun syncRemote(listRemote: (DavResponseCallback) -> Unit) {
+    protected open fun syncRemote(listRemote: (MultiResponseCallback) -> Unit) {
         // thread-safe sync stats
         val nInserted = AtomicInteger()
         val nUpdated = AtomicInteger()
@@ -611,9 +611,9 @@ abstract class SyncManager<ResourceType: LocalResource<*>, out CollectionType: L
         }
     }
 
-    protected abstract fun listAllRemote(callback: DavResponseCallback)
+    protected abstract fun listAllRemote(callback: MultiResponseCallback)
 
-    protected open fun listRemoteChanges(syncState: SyncState?, callback: DavResponseCallback): Pair<SyncToken, Boolean> {
+    protected open fun listRemoteChanges(syncState: SyncState?, callback: MultiResponseCallback): Pair<SyncToken, Boolean> {
         var furtherResults = false
 
         val report = davCollection.reportChanges(
@@ -625,7 +625,7 @@ abstract class SyncManager<ResourceType: LocalResource<*>, out CollectionType: L
                     furtherResults = response.status?.code == 507
 
                 Response.HrefRelation.MEMBER ->
-                    callback(response, relation)
+                    callback.onResponse(response, relation)
 
                 else ->
                     Logger.log.fine("Unexpected sync-collection response: $response")
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt
index d1dbc363..1d0fcdc4 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt
@@ -9,7 +9,7 @@ import android.content.Context
 import android.content.SyncResult
 import android.os.Bundle
 import at.bitfire.dav4jvm.DavCalendar
-import at.bitfire.dav4jvm.DavResponseCallback
+import at.bitfire.dav4jvm.MultiResponseCallback
 import at.bitfire.dav4jvm.Response
 import at.bitfire.dav4jvm.exception.DavException
 import at.bitfire.dav4jvm.property.*
@@ -83,7 +83,7 @@ class TasksSyncManager(
         os.toByteArray().toRequestBody(DavCalendar.MIME_ICALENDAR_UTF8)
     }
 
-    override fun listAllRemote(callback: DavResponseCallback) {
+    override fun listAllRemote(callback: MultiResponseCallback) {
         remoteExceptionContext { remote ->
             Logger.log.info("Querying tasks")
             remote.calendarQuery("VTODO", null, null, callback)
diff --git a/build.gradle b/build.gradle
index 394805e2..1b5e9767 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,9 +10,9 @@ buildscript {
     ext.versions = [
         aboutLibraries: '8.9.4',
         appIntro: '6.2.0',
-        dav4jvm: 'c61e4b0c80a5a8de1df99b4997445bb323d3ea3d',
+        dav4jvm: '2.2',
         hilt: '2.44',
-        kotlin: '1.7.10',
+        kotlin: '1.7.20',
         okhttp: '4.10.0',
         // latest Apache Commons versions that don't require Java 8 (Android 7)
         commonsCollections: '4.2',