diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle index a458ab58..be70f38e 100644 --- a/owncloudComLibrary/build.gradle +++ b/owncloudComLibrary/build.gradle @@ -29,8 +29,8 @@ android { minSdkVersion 21 targetSdkVersion 28 - versionCode = 10000402 - versionName = "1.0.5-beta.1" + versionCode = 10000403 + versionName = "1.0.5-beta.2" // This is pretty ugly but manifest placeholders don't seem to work very well when using different modules // See https://github.com/openid/AppAuth-Android/issues/325 diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt index a2dca06e..49efaea9 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt @@ -42,6 +42,7 @@ data class CapabilityResponse( versionString = serverVersion?.string ?: "", versionEdition = serverVersion?.edition ?: "", corePollinterval = capabilities?.coreCapabilities?.pollinterval ?: 0, + chunkingVersion = capabilities?.davCapabilities?.chunking ?: "", filesSharingApiEnabled = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingApiEnabled), filesSharingResharing = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingReSharing), filesSharingPublicEnabled = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingPublic?.enabled), @@ -79,7 +80,9 @@ data class Capabilities( @Json(name = "files_sharing") val fileSharingCapabilities: FileSharingCapabilities?, @Json(name = "files") - val fileCapabilities: FileCapabilities? + val fileCapabilities: FileCapabilities?, + @Json(name = "dav") + val davCapabilities: DavCapabilities? ) @JsonClass(generateAdapter = true) @@ -151,6 +154,11 @@ data class FileCapabilities( val versioning: Boolean? ) +@JsonClass(generateAdapter = true) +data class DavCapabilities( + val chunking: String? +) + @JsonClass(generateAdapter = true) data class ServerVersion( var major: Int?, diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/RemoteCapability.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/RemoteCapability.kt index 5dd0988f..6e97ba0c 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/RemoteCapability.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/RemoteCapability.kt @@ -42,6 +42,9 @@ data class RemoteCapability( // Core PollInterval var corePollinterval: Int = 0, + // Dav Capabilities + val chunkingVersion: String = "", + // Files Sharing var filesSharingApiEnabled: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingPublicEnabled: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, @@ -52,11 +55,9 @@ data class RemoteCapability( var filesSharingPublicExpireDateEnabled: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingPublicExpireDateDays: Int = 0, var filesSharingPublicExpireDateEnforced: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, - var filesSharingPublicSendMail: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingPublicUpload: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingPublicMultiple: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingPublicSupportsUploadOnly: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, - var filesSharingUserSendMail: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingResharing: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingFederationOutgoing: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingFederationIncoming: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,