From 6844c572480a7a5f0c4cfd74acc0bd6d6e402572 Mon Sep 17 00:00:00 2001 From: Ramsey Smith <142836716+ramsey-livefront@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:12:07 -0700 Subject: [PATCH] Fix sync response for send object (#335) --- .../datasource/network/serializer/LocalDateTimeSerializer.kt | 2 +- .../data/vault/datasource/network/model/SyncResponseJson.kt | 2 +- .../data/vault/repository/util/VaultSdkSendExtensions.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/serializer/LocalDateTimeSerializer.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/serializer/LocalDateTimeSerializer.kt index 77da97ca1..f66a97c18 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/serializer/LocalDateTimeSerializer.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/serializer/LocalDateTimeSerializer.kt @@ -14,7 +14,7 @@ import java.time.format.DateTimeFormatter */ class LocalDateTimeSerializer : KSerializer { private val dateTimeFormatterDeserialization = DateTimeFormatter - .ofPattern("yyyy-MM-dd'T'HH:mm:ss.[SSSSSSS][SSSSSS][SSSSS][SSSS][SSS][SS][S]'Z'") + .ofPattern("yyyy-MM-dd'T'HH:mm:ss[.][:][SSSSSSS][SSSSSS][SSSSS][SSSS][SSS][SS][S]'Z'") private val dateTimeFormatterSerialization = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") override val descriptor: SerialDescriptor diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseJson.kt index 487817cf0..293e17d31 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseJson.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseJson.kt @@ -882,7 +882,7 @@ data class SyncResponseJson( val password: String?, @SerialName("file") - val file: File, + val file: File?, @SerialName("deletionDate") @Contextual diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt index 024903cfc..b0ea95e8e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt @@ -28,7 +28,7 @@ fun SyncResponseJson.Send.toEncryptedSdkSend(): Send = key = key.toString(), password = password, type = type.toSdkSendType(), - file = file.toEncryptedSdkFile(), + file = file?.toEncryptedSdkFile(), text = text.toEncryptedSdkText(), maxAccessCount = maxAccessCount?.toUInt(), accessCount = accessCount.toUInt(),