From 2b299da41583fc221d5071817f751b13d16447d4 Mon Sep 17 00:00:00 2001
From: Fernando Sanz <fsanz@izertis.com>
Date: Wed, 10 Nov 2021 16:42:14 +0100
Subject: [PATCH 1/2] Retrieve new capability to user's avatar.
---
.../lib/resources/status/RemoteCapability.kt | 1 +
.../status/responses/CapabilityResponse.kt | 13 +++++++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
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 6e97ba0c..450432f6 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
@@ -61,6 +61,7 @@ data class RemoteCapability(
var filesSharingResharing: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingFederationOutgoing: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingFederationIncoming: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
+ var filesSharingUserProfilePicture:CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
// Files
var filesBigFileChunking: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/responses/CapabilityResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/responses/CapabilityResponse.kt
index dea2431e..2965530b 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/responses/CapabilityResponse.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/responses/CapabilityResponse.kt
@@ -69,7 +69,8 @@ data class CapabilityResponse(
filesUndelete = CapabilityBooleanType.fromBooleanValue(capabilities?.fileCapabilities?.undelete),
filesVersioning = CapabilityBooleanType.fromBooleanValue(capabilities?.fileCapabilities?.versioning),
filesSharingFederationIncoming = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingFederation?.incoming),
- filesSharingFederationOutgoing = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingFederation?.outgoing)
+ filesSharingFederationOutgoing = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingFederation?.outgoing),
+ filesSharingUserProfilePicture = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingUser?.profilePicture),
)
}
@@ -99,7 +100,9 @@ data class FileSharingCapabilities(
@Json(name = "resharing")
val fileSharingReSharing: Boolean?,
@Json(name = "federation")
- val fileSharingFederation: FileSharingFederation?
+ val fileSharingFederation: FileSharingFederation?,
+ @Json(name = "user")
+ val fileSharingUser: FileSharingUser?,
)
@JsonClass(generateAdapter = true)
@@ -147,6 +150,12 @@ data class FileSharingFederation(
val outgoing: Boolean?
)
+@JsonClass(generateAdapter = true)
+data class FileSharingUser(
+ @Json(name = "profile_picture")
+ val profilePicture: Boolean?,
+)
+
@JsonClass(generateAdapter = true)
data class FileCapabilities(
val bigfilechunking: Boolean?,
From 27e5d367af261246c3a3fbb571bd1a5450e771b3 Mon Sep 17 00:00:00 2001
From: Fernando Sanz <fsanz@izertis.com>
Date: Wed, 10 Nov 2021 18:08:09 +0100
Subject: [PATCH 2/2] Ktlint fixes.
---
.../owncloud/android/lib/resources/status/RemoteCapability.kt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 450432f6..8295d5ff 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
@@ -61,7 +61,7 @@ data class RemoteCapability(
var filesSharingResharing: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingFederationOutgoing: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
var filesSharingFederationIncoming: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
- var filesSharingUserProfilePicture:CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
+ var filesSharingUserProfilePicture: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,
// Files
var filesBigFileChunking: CapabilityBooleanType = CapabilityBooleanType.UNKNOWN,