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

Unverified Commit 6082fae7 authored by Mario Danic's avatar Mario Danic Committed by AndyScherzinger
Browse files

Add support for new DAV endpoint

parent 1c02dcaa

src/com/owncloud/android/lib/common/accounts/AccountUtils.java

+11 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ public class AccountUtils { 
    public static final String WEBDAV_PATH_1_2 = "/webdav/owncloud.php";

    public static final String WEBDAV_PATH_2_0 = "/files/webdav.php";

    public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";

	public static final String WEBDAV_PATH_9_0 = "/remote.php/dav";

    public static final String ODAV_PATH = "/remote.php/odav";

    private static final String SAML_SSO_PATH = "/remote.php/webdav";

    public static final String CARDDAV_PATH_2_0 = "/apps/contacts/carddav.php";
@@ -71,8 +72,17 @@ public class AccountUtils { 
                return ODAV_PATH;

            }

            if (supportsSamlSso) {

				if (version.compareTo(OwnCloudVersion.nextcloud_9) < 0) {

					return SAML_SSO_PATH;

				} else {

					return WEBDAV_PATH_9_0;

				}

            }



			if (version.compareTo(OwnCloudVersion.nextcloud_9) >= 0) {

				return WEBDAV_PATH_9_0;

			}



            if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0)

                return WEBDAV_PATH_4_0;

            if (version.compareTo(OwnCloudVersion.owncloud_v3) >= 0

src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> { 
            0x04000000);

    public static final OwnCloudVersion owncloud_v4_5 = new OwnCloudVersion(

            0x04050000);

    public static final OwnCloudVersion nextcloud_9 = new OwnCloudVersion(0x09000000); // 9.0



    public static final int MINIMUN_VERSION_FOR_CHUNKED_UPLOADS = 0x04050000; // 4.5
@@ -49,6 +50,7 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> { 


    public static final int VERSION_8 = 0x08000000; // 8.0





    public static final int MINIMUM_VERSION_CAPABILITIES_API = 0x08010000; // 8.1



    public static final int MINIMUM_SELF_API = 0x0B000200;