Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit e6e7638

Browse files
authored
Merge pull request #442 from owncloud/feature/avatar_capability_library
[Feature] Respect capability for Avatar support
2 parents 2c0745f + 27e5d36 commit e6e7638

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ data class RemoteCapability(
6161
var filesSharingResharing: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
6262
var filesSharingFederationOutgoing: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
6363
var filesSharingFederationIncoming: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
64+
var filesSharingUserProfilePicture: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
6465

6566
// Files
6667
var filesBigFileChunking: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/responses/CapabilityResponse.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ data class CapabilityResponse(
6969
filesUndelete = CapabilityBooleanType.fromBooleanValue(capabilities?.fileCapabilities?.undelete),
7070
filesVersioning = CapabilityBooleanType.fromBooleanValue(capabilities?.fileCapabilities?.versioning),
7171
filesSharingFederationIncoming = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingFederation?.incoming),
72-
filesSharingFederationOutgoing = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingFederation?.outgoing)
72+
filesSharingFederationOutgoing = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingFederation?.outgoing),
73+
filesSharingUserProfilePicture = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingUser?.profilePicture),
7374
)
7475
}
7576

@@ -99,7 +100,9 @@ data class FileSharingCapabilities(
99100
@Json(name = "resharing")
100101
val fileSharingReSharing: Boolean?,
101102
@Json(name = "federation")
102-
val fileSharingFederation: FileSharingFederation?
103+
val fileSharingFederation: FileSharingFederation?,
104+
@Json(name = "user")
105+
val fileSharingUser: FileSharingUser?,
103106
)
104107

105108
@JsonClass(generateAdapter = true)
@@ -147,6 +150,12 @@ data class FileSharingFederation(
147150
val outgoing: Boolean?
148151
)
149152

153+
@JsonClass(generateAdapter = true)
154+
data class FileSharingUser(
155+
@Json(name = "profile_picture")
156+
val profilePicture: Boolean?,
157+
)
158+
150159
@JsonClass(generateAdapter = true)
151160
data class FileCapabilities(
152161
val bigfilechunking: Boolean?,

0 commit comments

Comments
 (0)