From b093619b62a33775a097fc40ad47732d31bd57e3 Mon Sep 17 00:00:00 2001
From: Michael Totschnig <michael@totschnig.org>
Date: Thu, 20 Feb 2025 21:05:15 +0100
Subject: [PATCH] Fixes #1655

---
 .../myexpenses/sync/AbstractSyncBackendProvider.kt       | 2 --
 .../org/totschnig/webdav/sync/WebDavBackendProvider.kt   | 5 -----
 .../org/totschnig/webdav/sync/client/WebDavClient.kt     | 9 ++++-----
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/myExpenses/src/main/java/org/totschnig/myexpenses/sync/AbstractSyncBackendProvider.kt b/myExpenses/src/main/java/org/totschnig/myexpenses/sync/AbstractSyncBackendProvider.kt
index 1e1b4f392d..c32444d0ba 100644
--- a/myExpenses/src/main/java/org/totschnig/myexpenses/sync/AbstractSyncBackendProvider.kt
+++ b/myExpenses/src/main/java/org/totschnig/myexpenses/sync/AbstractSyncBackendProvider.kt
@@ -14,7 +14,6 @@ import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
 import org.apache.commons.lang3.StringUtils
@@ -50,7 +49,6 @@ import org.totschnig.myexpenses.util.io.getNameWithoutExtension
 import java.io.*
 import java.security.GeneralSecurityException
 import java.util.*
-import kotlin.collections.contains
 
 abstract class AbstractSyncBackendProvider<Res>(protected val context: Context) :
     SyncBackendProvider, ResourceStorage<Res> {
diff --git a/webdav/src/main/java/org/totschnig/webdav/sync/WebDavBackendProvider.kt b/webdav/src/main/java/org/totschnig/webdav/sync/WebDavBackendProvider.kt
index d2052bb0c4..d1d56cce14 100644
--- a/webdav/src/main/java/org/totschnig/webdav/sync/WebDavBackendProvider.kt
+++ b/webdav/src/main/java/org/totschnig/webdav/sync/WebDavBackendProvider.kt
@@ -233,11 +233,6 @@ class WebDavBackendProvider @SuppressLint("MissingPermission") internal construc
         val base = if (toAccountDir) accountRes else webDavClient.base
         val parent = if (folder != null) {
             webDavClient.mkCol(folder, base)
-            webDavClient.getCollection(folder, accountUuid).also {
-                if (!it.exists()) {
-                    throw IOException("Cannot make folder")
-                }
-            }
         } else base
         saveFileContents(fileName, fileContents, mimeType, maybeEncrypt, parent)
     }
diff --git a/webdav/src/main/java/org/totschnig/webdav/sync/client/WebDavClient.kt b/webdav/src/main/java/org/totschnig/webdav/sync/client/WebDavClient.kt
index a582539524..4f5dce15a5 100644
--- a/webdav/src/main/java/org/totschnig/webdav/sync/client/WebDavClient.kt
+++ b/webdav/src/main/java/org/totschnig/webdav/sync/client/WebDavClient.kt
@@ -134,11 +134,10 @@ class WebDavClient(
     }
 
     @Throws(IOException::class)
-    fun mkCol(folderName: String, parent: DavResource) {
-        val folder =
-            LockableDavResource(httpClient, buildCollectionUri(folderName, parent.location))
-        folder.mkColWithLock(buildIfHeader(parent.location))
-    }
+    fun mkCol(folderName: String, parent: DavResource) =
+        LockableDavResource(httpClient, buildCollectionUri(folderName, parent.location)).also {
+            it.mkColWithLock(buildIfHeader(parent.location))
+        }
 
     /**
      * @param folderPath if null, members of base uri are returned