Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit f7234c86 authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #292 from nextcloud/richDocumentsOptionalMimetypes 

Add optional mimetypes to rich documents
parents 1cd9e0f2 0c8f1108

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

+14 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation { 
    // Richdocuments

    private static final String NODE_RICHDOCUMENTS = "richdocuments";

    private static final String NODE_MIMETYPES = "mimetypes";

    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";
@@ -417,6 +418,19 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation { 
                            

                            capability.setRichDocumentsMimeTypeList(mimeTypes);



                            if (richDocumentsCapability.has(NODE_OPTIONAL_MIMETYPES)) {

                                JSONArray optionalMimeTypesArray = richDocumentsCapability

                                        .getJSONArray(NODE_OPTIONAL_MIMETYPES);



                                ArrayList<String> optionalMimeTypes = new ArrayList<>();



                                for (int i = 0; i < optionalMimeTypesArray.length(); i++) {

                                    optionalMimeTypes.add(optionalMimeTypesArray.getString(i));

                                }



                                capability.setRichDocumentsOptionalMimeTypeList(optionalMimeTypes);

                            }



                            if (richDocumentsCapability.has(NODE_RICHDOCUMENTS_DIRECT_EDITING)) {

                                if (richDocumentsCapability.getBoolean(NODE_RICHDOCUMENTS_DIRECT_EDITING)) {

                                    capability.setRichDocumentsDirectEditing(CapabilityBooleanType.TRUE);

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

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ public class OCCapability { 
    private CapabilityBooleanType richDocumentsDirectEditing;

    private CapabilityBooleanType richDocumentsTemplatesAvailable;

    private List<String> richDocumentsMimeTypeList;

    private List<String> richDocumentsOptionalMimeTypeList;



    private CapabilityBooleanType activity;
@@ -150,6 +151,7 @@ public class OCCapability { 


        richDocuments = CapabilityBooleanType.UNKNOWN;

        richDocumentsMimeTypeList = new ArrayList<>();

        richDocumentsOptionalMimeTypeList = new ArrayList<>();

        richDocumentsDirectEditing = CapabilityBooleanType.FALSE;

        richDocumentsTemplatesAvailable = CapabilityBooleanType.FALSE;

    }