From 0d0fb270fc3de290ec9655c7472fd3e993d38c7b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:15:31 +0000 Subject: [PATCH] =?UTF-8?q?fix(e2ei):=20crash=20on=20downloading=20certifi?= =?UTF-8?q?cates=20(WPB-9097)=20=F0=9F=8D=92=20=F0=9F=8D=92=20(#2786)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Commit with unresolved merge conflicts * resolve conflicts --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Michał Saleniuk Co-authored-by: Mojtaba Chenani --- .../wire/kalium/logic/feature/e2ei/E2eiCertificate.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/E2eiCertificate.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/E2eiCertificate.kt index c825da89d2e..50c85858c99 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/E2eiCertificate.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/E2eiCertificate.kt @@ -20,13 +20,22 @@ package com.wire.kalium.logic.feature.e2ei import com.wire.kalium.cryptography.WireIdentity import com.wire.kalium.logic.di.MapperProvider import kotlinx.datetime.Instant +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable +@Serializable data class E2eiCertificate( + @SerialName("userHandle") var userHandle: String, + @SerialName("status") val status: CertificateStatus, + @SerialName("serialNumber") val serialNumber: String, + @SerialName("certificateDetail") val certificateDetail: String, + @SerialName("thumbprint") val thumbprint: String, + @SerialName("endAt") val endAt: Instant ) { companion object {