Merge pull request #291 from nextcloud/richDocumentsProductName

Add product name to rich documents
nextcloud · May 9, 2019 · b15a976 · b15a976
2 parents c7c34b1 + 2149b2d
commit b15a976
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
@@ -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";
@@ -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);
                         }

diff --git a/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.java b/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.java
@@ -99,6 +99,7 @@ public class OCCapability {
     private CapabilityBooleanType richDocumentsTemplatesAvailable;
     private List<String> richDocumentsMimeTypeList;
     private List<String> richDocumentsOptionalMimeTypeList;
+    private String richDocumentsProductName;
 
     private CapabilityBooleanType activity;
 
@@ -154,6 +155,7 @@ public OCCapability() {
         richDocumentsOptionalMimeTypeList = new ArrayList<>();
         richDocumentsDirectEditing = CapabilityBooleanType.FALSE;
         richDocumentsTemplatesAvailable = CapabilityBooleanType.FALSE;
+        richDocumentsProductName = "Collabora Online";
     }
 
     public OwnCloudVersion getVersion() {