mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-22 17:36:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix sync response for send object (#335)

Browse source
This commit is contained in:
Ramsey Smith 2023-12-06 13:12:07 -07:00 committed by Álison Fernandes
parent b0e3aca323
commit 6844c57248
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/serializer/LocalDateTimeSerializer.kt
View file

@ -14,7 +14,7 @@ import java.time.format.DateTimeFormatter
*/ */
class LocalDateTimeSerializer : KSerializer<LocalDateTime> { class LocalDateTimeSerializer : KSerializer<LocalDateTime> {
private val dateTimeFormatterDeserialization = DateTimeFormatter 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 = private val dateTimeFormatterSerialization =
DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
override val descriptor: SerialDescriptor override val descriptor: SerialDescriptor

2
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseJson.kt
View file

@ -882,7 +882,7 @@ data class SyncResponseJson(
val password: String?, val password: String?,
@SerialName("file") @SerialName("file")
val file: File, val file: File?,
@SerialName("deletionDate") @SerialName("deletionDate")
@Contextual @Contextual

2
app/src/main/java/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkSendExtensions.kt
View file

@ -28,7 +28,7 @@ fun SyncResponseJson.Send.toEncryptedSdkSend(): Send =
key = key.toString(), key = key.toString(),
password = password, password = password,
type = type.toSdkSendType(), type = type.toSdkSendType(),
file = file.toEncryptedSdkFile(), file = file?.toEncryptedSdkFile(),
text = text.toEncryptedSdkText(), text = text.toEncryptedSdkText(),
maxAccessCount = maxAccessCount?.toUInt(), maxAccessCount = maxAccessCount?.toUInt(),
accessCount = accessCount.toUInt(), accessCount = accessCount.toUInt(),