Skip to content

Commit f7234c8

Browse files
Merge pull request #292 from nextcloud/richDocumentsOptionalMimetypes
Add optional mimetypes to rich documents
2 parents 1cd9e0f + 0c8f110 commit f7234c8

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
133133
// Richdocuments
134134
private static final String NODE_RICHDOCUMENTS = "richdocuments";
135135
private static final String NODE_MIMETYPES = "mimetypes";
136+
private static final String NODE_OPTIONAL_MIMETYPES = "mimetypesNoDefaultOpen";
136137
private static final String NODE_RICHDOCUMENTS_DIRECT_EDITING = "direct_editing";
137138
private static final String NODE_RICHDOCUMENTS_TEMPLATES = "templates";
138139

@@ -417,6 +418,19 @@ protected RemoteOperationResult run(OwnCloudClient client) {
417418

418419
capability.setRichDocumentsMimeTypeList(mimeTypes);
419420

421+
if (richDocumentsCapability.has(NODE_OPTIONAL_MIMETYPES)) {
422+
JSONArray optionalMimeTypesArray = richDocumentsCapability
423+
.getJSONArray(NODE_OPTIONAL_MIMETYPES);
424+
425+
ArrayList<String> optionalMimeTypes = new ArrayList<>();
426+
427+
for (int i = 0; i < optionalMimeTypesArray.length(); i++) {
428+
optionalMimeTypes.add(optionalMimeTypesArray.getString(i));
429+
}
430+
431+
capability.setRichDocumentsOptionalMimeTypeList(optionalMimeTypes);
432+
}
433+
420434
if (richDocumentsCapability.has(NODE_RICHDOCUMENTS_DIRECT_EDITING)) {
421435
if (richDocumentsCapability.getBoolean(NODE_RICHDOCUMENTS_DIRECT_EDITING)) {
422436
capability.setRichDocumentsDirectEditing(CapabilityBooleanType.TRUE);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ public class OCCapability {
9898
private CapabilityBooleanType richDocumentsDirectEditing;
9999
private CapabilityBooleanType richDocumentsTemplatesAvailable;
100100
private List<String> richDocumentsMimeTypeList;
101+
private List<String> richDocumentsOptionalMimeTypeList;
101102

102103
private CapabilityBooleanType activity;
103104

@@ -150,6 +151,7 @@ public OCCapability() {
150151

151152
richDocuments = CapabilityBooleanType.UNKNOWN;
152153
richDocumentsMimeTypeList = new ArrayList<>();
154+
richDocumentsOptionalMimeTypeList = new ArrayList<>();
153155
richDocumentsDirectEditing = CapabilityBooleanType.FALSE;
154156
richDocumentsTemplatesAvailable = CapabilityBooleanType.FALSE;
155157
}

0 commit comments

Comments
 (0)