Skip to content

Commit faa8c7c

Browse files
Merge pull request #1885 from nextcloud/backport/1870/stable-2.22.0
[stable-2.22.0] add: windows compatible filenames capability
2 parents 1c50c0a + aa33dc5 commit faa8c7c

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,11 @@ private void checkCapability(OCCapability capability, String userId) {
164164
if (capability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_32)) {
165165
assertTrue(capability.getUserStatusSupportsBusy().isTrue());
166166
}
167+
168+
// wcf
169+
if (capability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_32)) {
170+
assertTrue(capability.isWCFEnabled().isFalse());
171+
}
167172

168173
// support
169174
assertTrue(capability.getHasValidSubscription().isFalse());

library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@ public class GetCapabilitiesRemoteOperation extends RemoteOperation {
170170
private static final String FORBIDDEN_FILENAME_EXTENSIONS = "forbidden_filename_extensions";
171171
private static final String FORBIDDEN_FILENAME_BASE_NAMES = "forbidden_filename_basenames";
172172

173+
private static final String WINDOWS_COMPATIBLE_FILENAMES = "windows_compatible_filenames";
174+
173175
// files download limits
174176
private static final String NODE_FILES_DOWNLOAD_LIMIT = "downloadlimit";
175177
private static final String FILES_DOWNLOAD_LIMIT_DEFAULT = "default-limit";
@@ -486,6 +488,11 @@ private OCCapability parseResponse(String response) throws JSONException {
486488
JSONArray result = respFiles.getJSONArray(FORBIDDEN_FILENAME_BASE_NAMES);
487489
capability.setForbiddenFilenameBaseNamesJson(result.toString());
488490
}
491+
492+
if (respFiles.has(WINDOWS_COMPATIBLE_FILENAMES)) {
493+
capability.setWCFEnabled(CapabilityBooleanType.fromBooleanValue(
494+
respFiles.getBoolean(WINDOWS_COMPATIBLE_FILENAMES)));
495+
}
489496
// endregion
490497

491498
Log_OC.d(TAG, "*** Added " + NODE_FILES);

library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ class OCCapability {
113113
var forbiddenFilenamesJson: String? = null
114114
var forbiddenFilenameExtensionJson: String? = null
115115
var forbiddenFilenameBaseNamesJson: String? = null
116+
var isWCFEnabled = CapabilityBooleanType.UNKNOWN
116117

117118
// files download limits
118119
var filesDownloadLimit = CapabilityBooleanType.UNKNOWN

0 commit comments

Comments
 (0)