Merge pull request #15824 from nextcloud/skip-auto-rename-if-wcf-disabled

alperozturk96 · web-flow · commit 78a17b7fca77 · 2025-11-05T11:01:42.000+01:00
skip auto rename and filename validator if wcf disabled
diff --git a/app/schemas/com.nextcloud.client.database.NextcloudDatabase/94.json b/app/schemas/com.nextcloud.client.database.NextcloudDatabase/94.json
diff --git a/app/src/androidTest/java/com/nextcloud/utils/AutoRenameTests.kt b/app/src/androidTest/java/com/nextcloud/utils/AutoRenameTests.kt
@@ -10,6 +10,7 @@ package com.nextcloud.utils
 import com.nextcloud.utils.autoRename.AutoRename
 import com.owncloud.android.AbstractOnServerIT
 import com.owncloud.android.datamodel.e2e.v2.decrypted.DecryptedFile
+import com.owncloud.android.lib.resources.status.CapabilityBooleanType
 import com.owncloud.android.lib.resources.status.NextcloudVersion
 import com.owncloud.android.lib.resources.status.OCCapability
 import org.junit.Before
@@ -27,6 +28,7 @@ class AutoRenameTests : AbstractOnServerIT() {
         testOnlyOnServer(NextcloudVersion.nextcloud_30)
 
         capability = capability.apply {
+            isWCFEnabled = CapabilityBooleanType.TRUE
             forbiddenFilenameExtensionJson = listOf(
                 """[" ",".",".part",".part"]""",
                 """[".",".part",".part"," "]""",
@@ -238,4 +240,14 @@ class AutoRenameTests : AbstractOnServerIT() {
         val expectedFilename = "Foo.Bar.Baz"
         assert(result == expectedFilename) { "Expected $expectedFilename but got $result" }
     }
+
+    @Test
+    fun skipAutoRenameWhenWCFDisabled() {
+        capability = capability.apply {
+            isWCFEnabled = CapabilityBooleanType.FALSE
+        }
+        val filename = "   readme.txt  "
+        val result = AutoRename.rename(filename, capability, isFolderPath = true)
+        assert(result == filename) { "Expected $filename but got $result" }
+    }
 }
diff --git a/app/src/androidTest/java/com/nextcloud/utils/CheckWCFRestrictionsTests.kt b/app/src/androidTest/java/com/nextcloud/utils/CheckWCFRestrictionsTests.kt
@@ -0,0 +1,63 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+package com.nextcloud.utils
+
+import com.nextcloud.utils.extensions.checkWCFRestrictions
+import com.owncloud.android.lib.resources.status.CapabilityBooleanType
+import com.owncloud.android.lib.resources.status.NextcloudVersion
+import com.owncloud.android.lib.resources.status.OCCapability
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+@Suppress("MagicNumber")
+class CheckWCFRestrictionsTests {
+
+    private fun createCapability(
+        version: NextcloudVersion,
+        isWCFEnabled: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN
+    ): OCCapability = OCCapability().apply {
+        this.versionMayor = version.majorVersionNumber
+        this.isWCFEnabled = isWCFEnabled
+    }
+
+    @Test
+    fun testReturnsFalseForVersionsOlderThan30() {
+        val capability = createCapability(NextcloudVersion.nextcloud_29)
+        assertFalse(capability.checkWCFRestrictions())
+    }
+
+    @Test
+    fun testReturnsTrueForVersion30WhenWCFAlwaysEnabled() {
+        val capability = createCapability(NextcloudVersion.nextcloud_30)
+        assertTrue(capability.checkWCFRestrictions())
+    }
+
+    @Test
+    fun testReturnsTrueForVersion31WhenWCFAlwaysEnabled() {
+        val capability = createCapability(NextcloudVersion.nextcloud_31)
+        assertTrue(capability.checkWCFRestrictions())
+    }
+
+    @Test
+    fun testReturnsTrueForVersion32WhenWCFEnabled() {
+        val capability = createCapability(NextcloudVersion.nextcloud_32, CapabilityBooleanType.TRUE)
+        assertTrue(capability.checkWCFRestrictions())
+    }
+
+    @Test
+    fun testReturnsFalseForVersion32WhenWCFDisabled() {
+        val capability = createCapability(NextcloudVersion.nextcloud_32, CapabilityBooleanType.FALSE)
+        assertFalse(capability.checkWCFRestrictions())
+    }
+
+    @Test
+    fun testReturnsFalseForVersion32WhenWCFIsUnknown() {
+        val capability = createCapability(NextcloudVersion.nextcloud_32)
+        assertFalse(capability.checkWCFRestrictions())
+    }
+}
diff --git a/app/src/androidTest/java/com/nextcloud/utils/FileNameValidatorTests.kt b/app/src/androidTest/java/com/nextcloud/utils/FileNameValidatorTests.kt
@@ -10,6 +10,7 @@ package com.nextcloud.utils
 import com.nextcloud.utils.fileNameValidator.FileNameValidator
 import com.owncloud.android.AbstractOnServerIT
 import com.owncloud.android.R
+import com.owncloud.android.lib.resources.status.CapabilityBooleanType
 import com.owncloud.android.lib.resources.status.NextcloudVersion
 import com.owncloud.android.lib.resources.status.OCCapability
 import org.junit.Assert.assertEquals
@@ -27,6 +28,7 @@ class FileNameValidatorTests : AbstractOnServerIT() {
     @Before
     fun setup() {
         capability = capability.apply {
+            isWCFEnabled = CapabilityBooleanType.TRUE
             forbiddenFilenamesJson = """[".htaccess",".htaccess"]"""
             forbiddenFilenameBaseNamesJson = """
                                     ["con", "prn", "aux", "nul", "com0", "com1", "com2", "com3", "com4", 
@@ -228,4 +230,14 @@ class FileNameValidatorTests : AbstractOnServerIT() {
         val result = FileNameValidator.checkFolderAndFilePaths(folderPath, listOf(), capability, targetContext)
         assertFalse(result)
     }
+
+    @Test
+    fun skipValidationWhenWCFDisabled() {
+        capability = capability.apply {
+            isWCFEnabled = CapabilityBooleanType.FALSE
+        }
+        val filename = "abc.txt"
+        val result = FileNameValidator.checkFileName(filename, capability, targetContext)
+        assertNull(result)
+    }
 }
diff --git a/app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt b/app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt
@@ -83,7 +83,8 @@ import com.owncloud.android.db.ProviderMeta
         AutoMigration(from = 89, to = 90),
         AutoMigration(from = 90, to = 91),
         AutoMigration(from = 91, to = 92),
-        AutoMigration(from = 92, to = 93, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
+        AutoMigration(from = 92, to = 93, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
+        AutoMigration(from = 93, to = 94, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
     ],
     exportSchema = true
 )
diff --git a/app/src/main/java/com/nextcloud/client/database/entity/CapabilityEntity.kt b/app/src/main/java/com/nextcloud/client/database/entity/CapabilityEntity.kt
@@ -142,5 +142,7 @@ data class CapabilityEntity(
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_DEFAULT_PERMISSIONS)
     val defaultPermissions: Int?,
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_USER_STATUS_SUPPORTS_BUSY)
-    val userStatusSupportsBusy: Int?
+    val userStatusSupportsBusy: Int?,
+    @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_WINDOWS_COMPATIBLE_FILENAMES)
+    val isWCFEnabled: Int?
 )
diff --git a/app/src/main/java/com/nextcloud/utils/autoRename/AutoRename.kt b/app/src/main/java/com/nextcloud/utils/autoRename/AutoRename.kt
@@ -8,12 +8,12 @@
 package com.nextcloud.utils.autoRename
 
 import com.nextcloud.utils.extensions.StringConstants
+import com.nextcloud.utils.extensions.checkWCFRestrictions
 import com.nextcloud.utils.extensions.forbiddenFilenameCharacters
 import com.nextcloud.utils.extensions.forbiddenFilenameExtensions
 import com.nextcloud.utils.extensions.shouldRemoveNonPrintableUnicodeCharactersAndConvertToUTF8
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.lib.common.utils.Log_OC
-import com.owncloud.android.lib.resources.status.NextcloudVersion
 import com.owncloud.android.lib.resources.status.OCCapability
 import org.apache.commons.io.FilenameUtils
 import java.util.regex.Pattern
@@ -25,12 +25,12 @@ object AutoRename {
     @Suppress("NestedBlockDepth")
     @JvmOverloads
     fun rename(filename: String, capability: OCCapability, isFolderPath: Boolean? = null): String {
-        Log_OC.d(TAG, "Before - $filename")
-
-        if (!capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_30)) {
+        if (!capability.checkWCFRestrictions()) {
             return filename
         }
 
+        Log_OC.d(TAG, "Before - $filename")
+
         val isFolder = isFolderPath ?: filename.endsWith(OCFile.PATH_SEPARATOR)
         val pathSegments = filename.split(OCFile.PATH_SEPARATOR).toMutableList()
 
diff --git a/app/src/main/java/com/nextcloud/utils/extensions/OCCapabilityExtensions.kt b/app/src/main/java/com/nextcloud/utils/extensions/OCCapabilityExtensions.kt
@@ -8,11 +8,31 @@
 package com.nextcloud.utils.extensions
 
 import com.google.gson.Gson
+import com.owncloud.android.lib.resources.status.NextcloudVersion
 import com.owncloud.android.lib.resources.status.OCCapability
 import org.json.JSONException
 
 private val gson = Gson()
 
+/**
+ * Determines whether **Windows-compatible file (WCF)** restrictions should be applied
+ * for the current server version and configuration.
+ *
+ * Behavior:
+ * - For **Nextcloud 32 and newer**, WCF enforcement depends on the [`isWCFEnabled`] flag
+ *   provided by the server capabilities.
+ * - For **Nextcloud 30 and 31**, WCF restrictions are always applied (feature considered enabled).
+ * - For **versions older than 30**, WCF is not supported, and no restrictions are applied.
+ *
+ * @return `true` if WCF restrictions should be enforced based on the server version and configuration;
+ * `false` otherwise.
+ */
+fun OCCapability.checkWCFRestrictions(): Boolean = if (version.isNewerOrEqual(NextcloudVersion.nextcloud_32)) {
+    isWCFEnabled.isTrue
+} else {
+    version.isNewerOrEqual(NextcloudVersion.nextcloud_30)
+}
+
 fun OCCapability.forbiddenFilenames(): List<String> = jsonToList(forbiddenFilenamesJson)
 
 fun OCCapability.forbiddenFilenameCharacters(): List<String> = jsonToList(forbiddenFilenameCharactersJson)
@@ -33,7 +53,7 @@ private fun jsonToList(json: String?): List<String> {
 
     return try {
         return gson.fromJson(json, Array<String>::class.java).toList()
-    } catch (e: JSONException) {
+    } catch (_: JSONException) {
         emptyList()
     }
 }
diff --git a/app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameValidator.kt b/app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameValidator.kt
@@ -10,14 +10,14 @@ package com.nextcloud.utils.fileNameValidator
 import android.content.Context
 import android.text.TextUtils
 import com.nextcloud.utils.extensions.StringConstants
+import com.nextcloud.utils.extensions.checkWCFRestrictions
 import com.nextcloud.utils.extensions.forbiddenFilenameBaseNames
 import com.nextcloud.utils.extensions.forbiddenFilenameCharacters
 import com.nextcloud.utils.extensions.forbiddenFilenameExtensions
 import com.nextcloud.utils.extensions.forbiddenFilenames
 import com.nextcloud.utils.extensions.removeFileExtension
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.OCFile
-import com.owncloud.android.lib.resources.status.NextcloudVersion
 import com.owncloud.android.lib.resources.status.OCCapability
 
 object FileNameValidator {
@@ -49,10 +49,11 @@ object FileNameValidator {
             }
         }
 
-        if (!capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_30)) {
+        if (!capability.checkWCFRestrictions()) {
             return null
         }
 
+        // region WCF related checks
         checkInvalidCharacters(filename, capability, context)?.let { return it }
 
         val filenameVariants = setOf(filename.lowercase(), filename.removeFileExtension().lowercase())
@@ -91,6 +92,7 @@ object FileNameValidator {
                 }
             }
         }
+        // endregion
 
         return null
     }
diff --git a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -2411,6 +2411,7 @@ private ContentValues createContentValues(String accountName, OCCapability capab
         contentValues.put(ProviderTableMeta.CAPABILITIES_FORBIDDEN_FILENAMES, capability.getForbiddenFilenamesJson());
         contentValues.put(ProviderTableMeta.CAPABILITIES_FORBIDDEN_FORBIDDEN_FILENAME_EXTENSIONS, capability.getForbiddenFilenameExtensionJson());
         contentValues.put(ProviderTableMeta.CAPABILITIES_FORBIDDEN_FORBIDDEN_FILENAME_BASE_NAMES, capability.getForbiddenFilenameBaseNamesJson());
+        contentValues.put(ProviderTableMeta.CAPABILITIES_WINDOWS_COMPATIBLE_FILENAMES, capability.isWCFEnabled().getValue());
         contentValues.put(ProviderTableMeta.CAPABILITIES_FILES_DOWNLOAD_LIMIT, capability.getFilesDownloadLimit().getValue());
         contentValues.put(ProviderTableMeta.CAPABILITIES_FILES_DOWNLOAD_LIMIT_DEFAULT, capability.getFilesDownloadLimitDefault());
 
@@ -2595,6 +2596,7 @@ private OCCapability createCapabilityInstance(Cursor cursor) {
             capability.setForbiddenFilenamesJson(getString(cursor, ProviderTableMeta.CAPABILITIES_FORBIDDEN_FILENAMES));
             capability.setForbiddenFilenameExtensionJson(getString(cursor, ProviderTableMeta.CAPABILITIES_FORBIDDEN_FORBIDDEN_FILENAME_EXTENSIONS));
             capability.setForbiddenFilenameBaseNamesJson(getString(cursor, ProviderTableMeta.CAPABILITIES_FORBIDDEN_FORBIDDEN_FILENAME_BASE_NAMES));
+            capability.setWCFEnabled(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_WINDOWS_COMPATIBLE_FILENAMES));
             capability.setFilesDownloadLimit(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_FILES_DOWNLOAD_LIMIT));
             capability.setFilesDownloadLimitDefault(getInt(cursor, ProviderTableMeta.CAPABILITIES_FILES_DOWNLOAD_LIMIT_DEFAULT));
 
diff --git a/app/src/main/java/com/owncloud/android/db/ProviderMeta.java b/app/src/main/java/com/owncloud/android/db/ProviderMeta.java
@@ -23,7 +23,7 @@
  */
 public class ProviderMeta {
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 93;
+    public static final int DB_VERSION = 94;
 
     private ProviderMeta() {
         // No instance
@@ -285,6 +285,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String CAPABILITIES_FORBIDDEN_FILENAMES = "forbidden_filenames";
         public static final String CAPABILITIES_FORBIDDEN_FORBIDDEN_FILENAME_EXTENSIONS = "forbidden_filename_extensions";
         public static final String CAPABILITIES_FORBIDDEN_FORBIDDEN_FILENAME_BASE_NAMES = "forbidden_filename_basenames";
+        public static final String CAPABILITIES_WINDOWS_COMPATIBLE_FILENAMES = "windows_compatible_filenames";
         public static final String CAPABILITIES_FILES_DOWNLOAD_LIMIT = "files_download_limit";
         public static final String CAPABILITIES_FILES_DOWNLOAD_LIMIT_DEFAULT = "files_download_limit_default";
         public static final String CAPABILITIES_NOTES_FOLDER_PATH = "notes_folder_path";
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -17479,6 +17479,14 @@
             <sha256 value="a1645c501eb6d57d317c90ae162709c6c98ff7b948c210e9e7ace78909ee84c8" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="2cbb669f3e">
+         <artifact name="android-library-2cbb669f3e.aar">
+            <sha256 value="8123aaea5d9c2fa439a635bb64d16ec532c596a4a2dd76e18da2fe729ab886ba" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-2cbb669f3e.module">
+            <sha256 value="4202f3716e02182d759b714b31d5c5af86a60a508477fd1e0e77b446f7fc23e1" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="2d47aa4a368b49465320c16609ad4427dd64ca86">
          <artifact name="android-library-2d47aa4a368b49465320c16609ad4427dd64ca86.aar">
             <sha256 value="d772821c93ced5f256dfc150f90bac38358ea037fa90ac80614cfd089c3996e6" origin="Generated by Gradle" reason="Artifact is not signed"/>

Original file line number	Diff line number	Diff line change
`@@ -142,5 +142,7 @@ data class CapabilityEntity(`
`142`	`142`	`@ColumnInfo(name = ProviderTableMeta.CAPABILITIES_DEFAULT_PERMISSIONS)`
`143`	`143`	`val defaultPermissions: Int?,`
`144`	`144`	`@ColumnInfo(name = ProviderTableMeta.CAPABILITIES_USER_STATUS_SUPPORTS_BUSY)`
`145`		`- val userStatusSupportsBusy: Int?`
	`145`	`+ val userStatusSupportsBusy: Int?,`
	`146`	`+ @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_WINDOWS_COMPATIBLE_FILENAMES)`
	`147`	`+ val isWCFEnabled: Int?`
`146`	`148`	`)`
Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,14 @@ package com.nextcloud.utils.fileNameValidator`
`10`	`10`	`import android.content.Context`
`11`	`11`	`import android.text.TextUtils`
`12`	`12`	`import com.nextcloud.utils.extensions.StringConstants`
	`13`	`+import com.nextcloud.utils.extensions.checkWCFRestrictions`
`13`	`14`	`import com.nextcloud.utils.extensions.forbiddenFilenameBaseNames`
`14`	`15`	`import com.nextcloud.utils.extensions.forbiddenFilenameCharacters`
`15`	`16`	`import com.nextcloud.utils.extensions.forbiddenFilenameExtensions`
`16`	`17`	`import com.nextcloud.utils.extensions.forbiddenFilenames`
`17`	`18`	`import com.nextcloud.utils.extensions.removeFileExtension`
`18`	`19`	`import com.owncloud.android.R`
`19`	`20`	`import com.owncloud.android.datamodel.OCFile`
`20`		`-import com.owncloud.android.lib.resources.status.NextcloudVersion`
`21`	`21`	`import com.owncloud.android.lib.resources.status.OCCapability`
`22`	`22`
`23`	`23`	`object FileNameValidator {`
`@@ -49,10 +49,11 @@ object FileNameValidator {`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`- if (!capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_30)) {`
	`52`	`+ if (!capability.checkWCFRestrictions()) {`
`53`	`53`	`return null`
`54`	`54`	`}`
`55`	`55`
	`56`	`+ // region WCF related checks`
`56`	`57`	`checkInvalidCharacters(filename, capability, context)?.let { return it }`
`57`	`58`
`58`	`59`	`val filenameVariants = setOf(filename.lowercase(), filename.removeFileExtension().lowercase())`
`@@ -91,6 +92,7 @@ object FileNameValidator {`
`91`	`92`	`}`
`92`	`93`	`}`
`93`	`94`	`}`
	`95`	`+ // endregion`
`94`	`96`
`95`	`97`	`return null`
`96`	`98`	`}`