Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add New Capabilities For Compatible File Names #1494

Merged
merged 8 commits into from
Aug 23, 2024
Merged

Add New Capabilities For Compatible File Names #1494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
58e1924
Add new capabilities
alperozturk96 Jul 3, 2024
993bce7
Use correct node
alperozturk96 Jul 3, 2024
a9357e4
Add new capabilities
alperozturk96 Jul 3, 2024
da7e9b1
remove backend forbidden char list
alperozturk96 Jul 3, 2024
7968e35
Fix json parse
alperozturk96 Jul 17, 2024
6a41a52
Use backend response for validation
alperozturk96 Jul 17, 2024
88f64a5
Add base names
alperozturk96 Jul 19, 2024
56fb2f1
Update name
alperozturk96 Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions ...c/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,12 @@ public class GetCapabilitiesRemoteOperation extends RemoteOperation {
private static final String NODE_SECURITY_GUARD = "security_guard";
private static final String NODE_DIAGNOSTICS = "diagnostics";

// needed for checking compatible filenames
private static final String FORBIDDEN_FILENAME_CHARACTERS = "forbidden_filename_characters";
private static final String FORBIDDEN_FILENAMES = "forbidden_filenames";
private static final String FORBIDDEN_FILENAME_EXTENSIONS = "forbidden_filename_extensions";
private static final String FORBIDDEN_FILENAME_BASE_NAMES = "forbidden_filename_basenames";

private OCCapability currentCapability = null;

public GetCapabilitiesRemoteOperation() {
Expand Down Expand Up @@ -438,6 +444,28 @@ private OCCapability parseResponse(String response) throws JSONException {
capability.setDirectEditingEtag(respDirectEditing.getString("etag"));
}

// region compatible file names
if (respFiles.has(FORBIDDEN_FILENAME_CHARACTERS)) {
JSONArray result = respFiles.getJSONArray(FORBIDDEN_FILENAME_CHARACTERS);
capability.setForbiddenFilenameCharactersJson(result.toString());
}

if (respFiles.has(FORBIDDEN_FILENAMES)) {
JSONArray result = respFiles.getJSONArray(FORBIDDEN_FILENAMES);
capability.setForbiddenFilenamesJson(result.toString());
}

if (respFiles.has(FORBIDDEN_FILENAME_EXTENSIONS)) {
JSONArray result = respFiles.getJSONArray(FORBIDDEN_FILENAME_EXTENSIONS);
capability.setForbiddenFilenameExtensionJson(result.toString());
}

if (respFiles.has(FORBIDDEN_FILENAME_BASE_NAMES)) {
JSONArray result = respFiles.getJSONArray(FORBIDDEN_FILENAME_BASE_NAMES);
capability.setForbiddenFilenameBaseNamesJson(result.toString());
}
// endregion

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

Expand Down
6 changes: 6 additions & 0 deletions library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ class OCCapability {
// Security guard
var securityGuard = CapabilityBooleanType.UNKNOWN

// needed for checking compatible filenames
var forbiddenFilenameCharactersJson: String? = null
var forbiddenFilenamesJson: String? = null
var forbiddenFilenameExtensionJson: String? = null
var forbiddenFilenameBaseNamesJson: String? = null

// Etag for capabilities
var etag: String? = ""

Expand Down
Loading