skip auto rename if wcf disabled

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

Author: alperozturk96

app/schemas/com.nextcloud.client.database.NextcloudDatabase/94.json

@@ -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
 )

app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.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?
 )

app/src/main/java/com/nextcloud/client/database/entity/CapabilityEntity.kt

@@ -8,12 +8,12 @@
 package com.nextcloud.utils.autoRename
 
 import com.nextcloud.utils.extensions.StringConstants
+import com.nextcloud.utils.extensions.canCheckWCFRelatedRestrictions
 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.canCheckWCFRelatedRestrictions()) {
             return filename
         }
 
+        Log_OC.d(TAG, "Before - $filename")
+
         val isFolder = isFolderPath ?: filename.endsWith(OCFile.PATH_SEPARATOR)
         val pathSegments = filename.split(OCFile.PATH_SEPARATOR).toMutableList()
 

app/src/main/java/com/nextcloud/utils/autoRename/AutoRename.kt

@@ -8,11 +8,15 @@
 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()
 
+fun OCCapability.canCheckWCFRelatedRestrictions(): Boolean =
+    version.isNewerOrEqual(NextcloudVersion.nextcloud_30) && isWCFEnabled.isTrue
+
 fun OCCapability.forbiddenFilenames(): List<String> = jsonToList(forbiddenFilenamesJson)
 
 fun OCCapability.forbiddenFilenameCharacters(): List<String> = jsonToList(forbiddenFilenameCharactersJson)
@@ -33,7 +37,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()
     }
 }

app/src/main/java/com/nextcloud/utils/extensions/OCCapabilityExtensions.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.canCheckWCFRelatedRestrictions
 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.canCheckWCFRelatedRestrictions()) {
             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
     }

app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameValidator.kt

@@ -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));
 

app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.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";