webDavParentPath

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/androidTest/java/com/nextcloud/utils/WebDavParentPathTests.kt

@@ -0,0 +1,105 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.utils
+
+import com.nextcloud.utils.extensions.webDavParentPath
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class WebDavParentPathTests {
+
+    // ── Happy path ────────────────────────────────────────────────────────────
+
+    @Test
+    fun testWebDavParentPathWhenGivenCorrectParentShouldReturnOneLevelAbove() {
+        assertEquals("/Photos/Vacation/", "/Photos/Vacation/beach.jpg".webDavParentPath())
+        assertEquals("/work/docs/", "/work/docs/notes.txt".webDavParentPath())
+    }
+
+    @Test
+    fun testWebDavParentPathWhenGivenDeepNestingShouldReturnDirectParent() {
+        assertEquals("/a/b/c/d/", "/a/b/c/d/e.txt".webDavParentPath())
+    }
+
+    // ── Root cases ────────────────────────────────────────────────────────────
+
+    @Test
+    fun testWebDavParentPathWhenGivenRootFileShouldReturnRoot() {
+        assertEquals("/", "/image.png".webDavParentPath())
+    }
+
+    @Test
+    fun testWebDavParentPathWhenGivenSlashShouldReturnRoot() {
+        assertEquals("/", "/".webDavParentPath())
+    }
+
+    @Test
+    fun testWebDavParentPathWhenGivenEmptyStringShouldReturnRoot() {
+        assertEquals("/", "".webDavParentPath())
+    }
+
+    @Test
+    fun testWebDavParentPathWhenGivenOnlySlashesShouldReturnRoot() {
+        assertEquals("/", "///".webDavParentPath())
+    }
+
+    // ── Relative paths ────────────────────────────────────────────────────────
+
+    @Test
+    fun testWebDavParentPathWhenGivenRelativePathShouldReturnOneLevelAbove() {
+        assertEquals("Documents/", "Documents/file.pdf".webDavParentPath())
+    }
+
+    @Test
+    fun testWebDavParentPathWhenGivenSingleWordPathShouldReturnRoot() {
+        assertEquals("/", "readme.md".webDavParentPath())
+    }
+
+    // ── Trailing slashes ──────────────────────────────────────────────────────
+
+    @Test
+    fun testWebDavParentPathWhenGivenTrailingSlashShouldReturnOneLevelAbove() {
+        assertEquals("/Photos/", "/Photos/Vacation/".webDavParentPath())
+    }
+
+    @Test
+    fun testWebDavParentPathWhenGivenMultipleTrailingSlashesShouldReturnOneLevelAbove() {
+        assertEquals("/Photos/", "/Photos/Vacation///".webDavParentPath())
+    }
+
+    // ── Encoded characters (WebDAV percent-encoding must be preserved) ────────
+
+    @Test
+    fun testWebDavParentPathWhenGivenEncodedSpacesShouldPreserveEncoding() {
+        assertEquals("/My%20Photos/", "/My%20Photos/beach%20photo.jpg".webDavParentPath())
+    }
+
+    @Test
+    fun testWebDavParentPathWhenGivenEncodedSpecialCharsShouldPreserveEncoding() {
+        assertEquals("/files/%23reports/", "/files/%23reports/q1%262.pdf".webDavParentPath())
+    }
+
+    // ── Unicode ───────────────────────────────────────────────────────────────
+
+    @Test
+    fun testWebDavParentPathWhenGivenUnicodeCharsShouldReturnOneLevelAbove() {
+        assertEquals("/照片/假期/", "/照片/假期/海滩.jpg".webDavParentPath())
+    }
+
+    // ── Single character ──────────────────────────────────────────────────────
+
+    @Test
+    fun testWebDavParentPathWhenGivenSingleCharFileAtRootShouldReturnRoot() {
+        assertEquals("/", "/a".webDavParentPath())
+    }
+
+    @Test
+    fun testWebDavParentPathWhenGivenSingleCharDirShouldReturnOneLevelAbove() {
+        assertEquals("/a/", "/a/b".webDavParentPath())
+    }
+}

app/src/main/java/com/nextcloud/utils/extensions/StringExtensions.kt

@@ -25,6 +25,13 @@ fun String.removeFileExtension(): String {
     }
 }
 
+fun String.webDavParentPath(): String {
+    val normalized = this.trimEnd('/')
+    if (normalized.isEmpty()) return "/"
+    val parent = normalized.substringBeforeLast('/', "")
+    return if (parent.isEmpty()) "/" else "$parent/"
+}
+
 @Suppress("ComplexCondition")
 fun String?.eTagChanged(eTagOnServer: String?): Boolean {
     if (this == null || this.isEmpty() || eTagOnServer == null || eTagOnServer.isEmpty()) {

app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.kt

@@ -27,6 +27,7 @@ import com.nextcloud.client.device.PowerManagementService
 import com.nextcloud.client.jobs.upload.FileUploadEventBroadcaster
 import com.nextcloud.client.jobs.upload.FileUploadHelper
 import com.nextcloud.client.utils.Throttler
+import com.nextcloud.utils.extensions.webDavParentPath
 import com.owncloud.android.R
 import com.owncloud.android.databinding.UploadListLayoutBinding
 import com.owncloud.android.datamodel.OCFile
@@ -50,6 +51,7 @@ import com.owncloud.android.utils.FilesSyncHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.apache.commons.io.FilenameUtils
 import javax.inject.Inject
 
 @Suppress("MagicNumber")
@@ -322,6 +324,7 @@ class UploadListActivity :
             val parentPath = storageManager
                 .getFileByPath(upload.remotePath)
                 .parentRemotePath
+                ?: upload.remotePath.webDavParentPath()
 
             val checkOp = ExistenceCheckRemoteOperation(parentPath, false)
             val checkResult = checkOp.execute(client)