flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 00:16:09 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
[Release] 1.0.5 beta 2
This commit is contained in:
Abel García de Prada 2020-05-22 14:58:22 +02:00 committed by GitHub
commit 8708af1cfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
owncloudComLibrary/build.gradle
View File

@ -29,8 +29,8 @@ android {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 28 targetSdkVersion 28
versionCode = 10000402 versionCode = 10000403
versionName = "1.0.5-beta.1" versionName = "1.0.5-beta.2"
// This is pretty ugly but manifest placeholders don't seem to work very well when using different modules // 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 // See https://github.com/openid/AppAuth-Android/issues/325

10
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt
View File

@ -42,6 +42,7 @@ data class CapabilityResponse(
versionString = serverVersion?.string ?: "", versionString = serverVersion?.string ?: "",
versionEdition = serverVersion?.edition ?: "", versionEdition = serverVersion?.edition ?: "",
corePollinterval = capabilities?.coreCapabilities?.pollinterval ?: 0, corePollinterval = capabilities?.coreCapabilities?.pollinterval ?: 0,
chunkingVersion = capabilities?.davCapabilities?.chunking ?: "",
filesSharingApiEnabled = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingApiEnabled), filesSharingApiEnabled = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingApiEnabled),
filesSharingResharing = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingReSharing), filesSharingResharing = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingReSharing),
filesSharingPublicEnabled = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingPublic?.enabled), filesSharingPublicEnabled = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingPublic?.enabled),
@ -79,7 +80,9 @@ data class Capabilities(
@Json(name = "files_sharing") @Json(name = "files_sharing")
val fileSharingCapabilities: FileSharingCapabilities?, val fileSharingCapabilities: FileSharingCapabilities?,
@Json(name = "files") @Json(name = "files")
val fileCapabilities: FileCapabilities? val fileCapabilities: FileCapabilities?,
@Json(name = "dav")
val davCapabilities: DavCapabilities?
) )
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
@ -151,6 +154,11 @@ data class FileCapabilities(
val versioning: Boolean? val versioning: Boolean?
) )
@JsonClass(generateAdapter = true)
data class DavCapabilities(
val chunking: String?
)
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
data class ServerVersion( data class ServerVersion(
var major: Int?, var major: Int?,

5
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/RemoteCapability.kt
View File

@ -42,6 +42,9 @@ data class RemoteCapability(
// Core PollInterval // Core PollInterval
var corePollinterval: Int = 0, var corePollinterval: Int = 0,
// Dav Capabilities
val chunkingVersion: String = "",
// Files Sharing // Files Sharing
var filesSharingApiEnabled: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingApiEnabled: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingPublicEnabled: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingPublicEnabled: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
@ -52,11 +55,9 @@ data class RemoteCapability(
var filesSharingPublicExpireDateEnabled: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingPublicExpireDateEnabled: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingPublicExpireDateDays: Int = 0, var filesSharingPublicExpireDateDays: Int = 0,
var filesSharingPublicExpireDateEnforced: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingPublicExpireDateEnforced: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingPublicSendMail: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingPublicUpload: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingPublicUpload: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingPublicMultiple: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingPublicMultiple: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingPublicSupportsUploadOnly: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingPublicSupportsUploadOnly: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingUserSendMail: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingResharing: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingResharing: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingFederationOutgoing: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingFederationOutgoing: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingFederationIncoming: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN, var filesSharingFederationIncoming: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,