Merge pull request #321 from owncloud/release/1.0.5_beta.2

[Release] 1.0.5 beta 2

Author: abelgardep

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

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?,

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,