Skip to content

Commit

Permalink
Merge pull request #13656 from nextcloud/fixType
Browse files Browse the repository at this point in the history
Fix typo?
  • Loading branch information
tobiasKaminsky authored Sep 30, 2024
2 parents 4309550 + 7bd0de6 commit 60005e6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package com.nextcloud.utils.autoRename

import com.nextcloud.utils.extensions.StringConstants
import com.nextcloud.utils.extensions.forbiddenFilenameCharacters
import com.nextcloud.utils.extensions.forbiddenFilenameExtension
import com.nextcloud.utils.extensions.forbiddenFilenameExtensions
import com.nextcloud.utils.extensions.shouldRemoveNonPrintableUnicodeCharactersAndConvertToUTF8
import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.lib.resources.status.NextcloudVersion
Expand Down Expand Up @@ -46,7 +46,7 @@ object AutoRename {
}

forbiddenFilenameExtensionJson?.let {
forbiddenFilenameExtension().forEach { forbiddenExtension ->
forbiddenFilenameExtensions().forEach { forbiddenExtension ->
pathSegments.replaceAll { segment ->
var modifiedSegment = segment
if (forbiddenExtension == StringConstants.SPACE) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fun OCCapability.forbiddenFilenameBaseNames(): List<String> = jsonToList(forbidd
fun OCCapability.shouldRemoveNonPrintableUnicodeCharactersAndConvertToUTF8(): Boolean {
return forbiddenFilenames().isNotEmpty() ||
forbiddenFilenameCharacters().isNotEmpty() ||
forbiddenFilenameExtension().isNotEmpty() ||
forbiddenFilenameExtensions().isNotEmpty() ||
forbiddenFilenameBaseNames().isNotEmpty()
}

Expand Down

0 comments on commit 60005e6

Please sign in to comment.