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

Unverified Commit 4e47b764 authored by Tobias Kaminsky's avatar Tobias Kaminsky Committed by GitHub
Browse files

Merge pull request #1688 from nextcloud/feature/use-default-sharing-permissions 

Feature - Use default sharing permissions
parents 766e7b81 0bc996e6

library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java

+6 −0
Original line number Diff line number Diff line
@@ -177,6 +177,8 @@ public class GetCapabilitiesRemoteOperation extends RemoteOperation { 
    private static final String NODE_NOTES = "notes";

    private static final String NOTES_PATH = "notes_path";



    private static final String PROPERTY_DEFAULT_PERMISSIONS = "default_permissions";



    private OCCapability currentCapability = null;



    public GetCapabilitiesRemoteOperation() {
@@ -368,6 +370,10 @@ public class GetCapabilitiesRemoteOperation extends RemoteOperation { 
                                respFilesSharing.getBoolean(PROPERTY_API_ENABLED)));

                    }



                    if (respFilesSharing.has(PROPERTY_DEFAULT_PERMISSIONS)) {

                        capability.setDefaultPermissions(respFilesSharing.getInt(PROPERTY_DEFAULT_PERMISSIONS));

                    }



                    if (respFilesSharing.has(NODE_PUBLIC)) {

                        JSONObject respPublic = respFilesSharing.getJSONObject(NODE_PUBLIC);

                        capability.setFilesSharingPublicEnabled(CapabilityBooleanType.fromBooleanValue(

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

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ class OCCapability { 
    // Etag for capabilities

    var etag: String? = ""



    var defaultPermissions: Int? = null



    val version: OwnCloudVersion

        get() =

            OwnCloudVersion(