From c5f8583146ed084db8acdab6e02c0aa44d4317cb Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Sun, 27 Jul 2025 10:50:50 -0500
Subject: [PATCH] Simplify fetching calendars

---
 app/src/main/java/org/tasks/caldav/CaldavClient.kt       | 8 +++++---
 app/src/main/java/org/tasks/caldav/CaldavSynchronizer.kt | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/tasks/caldav/CaldavClient.kt b/app/src/main/java/org/tasks/caldav/CaldavClient.kt
index 5b30de52f..2193c87d6 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavClient.kt
+++ b/app/src/main/java/org/tasks/caldav/CaldavClient.kt
@@ -18,7 +18,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -101,9 +100,12 @@ open class CaldavClient(
                 .findHomeset()
     }
 
-    suspend fun calendars(interceptor: (Interceptor.Chain) -> okhttp3.Response): List<Response> =
+    suspend fun calendars(interceptor: (okhttp3.Response) -> okhttp3.Response = { it }): List<Response> =
         DavResource(
-            httpClient.newBuilder().addNetworkInterceptor(interceptor).build(),
+            httpClient
+                .newBuilder()
+                .addNetworkInterceptor { interceptor(it.proceed(it.request())) }
+                .build(),
             httpUrl!!
         )
             .propfind(1, *calendarProperties)
diff --git a/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.kt b/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.kt
index 2d31eaa40..ac836cf33 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.kt
+++ b/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.kt
@@ -136,8 +136,7 @@ class CaldavSynchronizer @Inject constructor(
     private suspend fun synchronize(account: CaldavAccount) {
         val caldavClient = provider.forAccount(account)
         var serverType = account.serverType
-        val resources = caldavClient.calendars { chain ->
-            val response = chain.proceed(chain.request())
+        val resources = caldavClient.calendars { response ->
             if (serverType == SERVER_UNKNOWN) {
                 serverType = getServerType(account, response.headers)
             }