Skip to content

Add product name to rich documents #291

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

Merged
AndyScherzinger merged 1 commit into from
May 9, 2019
Merged

Add product name to rich documents #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
private static final String NODE_OPTIONAL_MIMETYPES = "mimetypesNoDefaultOpen";
private static final String NODE_RICHDOCUMENTS_DIRECT_EDITING = "direct_editing";
private static final String NODE_RICHDOCUMENTS_TEMPLATES = "templates";
private static final String NODE_RICHDOCUMENTS_PRODUCT_NAME = "productName";

// activity
private static final String NODE_ACTIVITY = "activity";
Expand Down Expand Up @@ -450,6 +451,11 @@ protected RemoteOperationResult run(OwnCloudClient client) {
} else {
capability.setRichDocumentsTemplatesAvailable(CapabilityBooleanType.FALSE);
}

if (richDocumentsCapability.has(NODE_RICHDOCUMENTS_PRODUCT_NAME)) {
capability.setRichDocumentsProductName(
richDocumentsCapability.getString(NODE_RICHDOCUMENTS_PRODUCT_NAME));
}
} else {
capability.setRichDocuments(CapabilityBooleanType.FALSE);
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/owncloud/android/lib/resources/status/OCCapability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public class OCCapability {
private CapabilityBooleanType richDocumentsTemplatesAvailable;
private List<String> richDocumentsMimeTypeList;
private List<String> richDocumentsOptionalMimeTypeList;
private String richDocumentsProductName;

private CapabilityBooleanType activity;

Expand Down Expand Up @@ -154,6 +155,7 @@ public OCCapability() {
richDocumentsOptionalMimeTypeList = new ArrayList<>();
richDocumentsDirectEditing = CapabilityBooleanType.FALSE;
richDocumentsTemplatesAvailable = CapabilityBooleanType.FALSE;
richDocumentsProductName = "Collabora Online";
}

public OwnCloudVersion getVersion() {
Expand Down