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

Unverified Commit 980a3404 authored by tobiasKaminsky's avatar tobiasKaminsky
Browse files

add capability 



Signed-off-by: default avatartobiasKaminsky <tobias@kaminsky.me>
parent 3f6116c1

library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java

+10 −7
Original line number Diff line number Diff line
@@ -9,6 +9,13 @@ 
 */

package com.owncloud.android;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertNotSame;

import static org.junit.Assert.assertSame;

import static org.junit.Assert.assertTrue;



import com.owncloud.android.lib.common.operations.RemoteOperationResult;

import com.owncloud.android.lib.resources.status.CapabilityBooleanType;

import com.owncloud.android.lib.resources.status.E2EVersion;
@@ -19,13 +26,6 @@ import com.owncloud.android.lib.resources.status.OwnCloudVersion; 


import org.junit.Test;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertNotSame;

import static org.junit.Assert.assertSame;

import static org.junit.Assert.assertTrue;



/**

 * Class to test GetRemoteCapabilitiesOperation

 */
@@ -154,5 +154,8 @@ public class GetCapabilitiesRemoteOperationIT extends AbstractIT { 


        // e2e

        assertNotSame(capability.getEndToEndEncryptionApiVersion(), E2EVersion.UNKNOWN);



        // recommendations

        assertTrue(capability.getRecommendations().isTrue());

    }

}

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

+16 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ public class GetCapabilitiesRemoteOperation extends RemoteOperation { 
    private static final String NODE_SECURITY_GUARD = "security_guard";

    private static final String NODE_DIAGNOSTICS = "diagnostics";



    //recommendations

    private static final String NODE_RECOMMENDATIONS = "recommendations";

    

    // needed for checking compatible filenames

    private static final String FORBIDDEN_FILENAME_CHARACTERS = "forbidden_filename_characters";

    private static final String FORBIDDEN_FILENAMES = "forbidden_filenames";
@@ -754,6 +757,19 @@ public class GetCapabilitiesRemoteOperation extends RemoteOperation { 
                        capability.setFilesDownloadLimitDefault(defaultDownloadLimit);

                    }

                }



                // recommendations

                if (respCapabilities.has(NODE_RECOMMENDATIONS)) {

                    JSONObject recommendationsCapability = respCapabilities.getJSONObject(NODE_RECOMMENDATIONS);



                    if (recommendationsCapability.getBoolean(PROPERTY_ENABLED)) {

                        capability.setRecommendations(CapabilityBooleanType.TRUE);

                    } else {

                        capability.setRecommendations(CapabilityBooleanType.FALSE);

                    }

                } else {

                    capability.setRecommendations(CapabilityBooleanType.FALSE);

                }

            }



            Log_OC.d(TAG, "*** Get Capabilities completed ");

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

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ class OCCapability { 
    // Security guard

    var securityGuard = CapabilityBooleanType.UNKNOWN



    // Recommendations

    var recommendations = CapabilityBooleanType.UNKNOWN



    // needed for checking compatible filenames

    var forbiddenFilenameCharactersJson: String? = null

    var forbiddenFilenamesJson: String? = null