Merge branch 'release/candidate' into feat/allow-creating-mls-convers…

…ations-with-partial-success
wireapp · Mar 11, 2024 · 60a075c · 60a075c
2 parents b0a11c6 + 6f2869d
commit 60a075c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/IDs.kt b/cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/IDs.kt
@@ -79,7 +79,7 @@ data class WireIdentity(
     val status: CryptoCertificateStatus,
     val thumbprint: String,
     val serialNumber: String,
-    val endTimestamp: Long
+    val endTimestampSeconds: Long
 )
 
 enum class CryptoCertificateStatus {

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
@@ -32,7 +32,7 @@ data class E2eiCertificate(
                 status = certificateStatusMapper.toCertificateStatus(identity.status),
                 serialNumber = identity.serialNumber,
                 certificateDetail = identity.certificate,
-                endAt = Instant.fromEpochMilliseconds(identity.endTimestamp)
+                endAt = Instant.fromEpochSeconds(identity.endTimestampSeconds)
             )
     }
 }
diff --git a/...ommonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt b/...ommonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt
@@ -1943,7 +1943,7 @@ class MLSConversationRepositoryTest {
                     CryptoCertificateStatus.VALID,
                     thumbprint = "thumbprint",
                     serialNumber = "serialNumber",
-                    endTimestamp = 1899105093
+                    endTimestampSeconds = 1899105093
                 )
             val E2EI_CONVERSATION_CLIENT_INFO_ENTITY =
                 E2EIConversationClientInfoEntity(UserIDEntity(uuid4().toString(), "domain.com"), "clientId", "groupId")

diff --git a/...wire/kalium/logic/feature/conversation/MLSConversationsVerificationStatusesHandlerTest.kt b/...wire/kalium/logic/feature/conversation/MLSConversationsVerificationStatusesHandlerTest.kt
@@ -184,7 +184,7 @@ class MLSConversationsVerificationStatusesHandlerTest {
                     serialNumber = "serial1",
                     status = CryptoCertificateStatus.VALID,
                     thumbprint = "thumbprint1",
-                    endTimestamp = 0L
+                    endTimestampSeconds = 0L
                 )
             ),
             user2.first.toModel() to listOf(
@@ -200,7 +200,7 @@ class MLSConversationsVerificationStatusesHandlerTest {
                     serialNumber = "serial2",
                     status = CryptoCertificateStatus.VALID,
                     thumbprint = "thumbprint2",
-                    endTimestamp = 0L
+                    endTimestampSeconds = 0L
                 )
             )
         )
@@ -256,7 +256,7 @@ class MLSConversationsVerificationStatusesHandlerTest {
                     serialNumber = "serial1",
                     status = CryptoCertificateStatus.VALID,
                     thumbprint = "thumbprint1",
-                    endTimestamp = 0L
+                    endTimestampSeconds = 0L
                 )
             ),
             user2.first.toModel() to listOf(
@@ -272,7 +272,7 @@ class MLSConversationsVerificationStatusesHandlerTest {
                     serialNumber = "serial2",
                     status = CryptoCertificateStatus.VALID,
                     thumbprint = "thumbprint2",
-                    endTimestamp = 0L
+                    endTimestampSeconds = 0L
                 )
             )
         )

diff --git a/...src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/GetE2eiCertificateUseCaseTest.kt b/...src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/GetE2eiCertificateUseCaseTest.kt
@@ -152,7 +152,7 @@ class GetE2eiCertificateUseCaseTest {
             status = CryptoCertificateStatus.EXPIRED,
             thumbprint = "thumbprint",
             serialNumber = "serialNumber",
-            endTimestamp = 1899105093
+            endTimestampSeconds = 1899105093
         )
     }
 }
diff --git a/...kotlin/com/wire/kalium/logic/feature/e2ei/GetMembersE2EICertificateStatusesUseCaseTest.kt b/...kotlin/com/wire/kalium/logic/feature/e2ei/GetMembersE2EICertificateStatusesUseCaseTest.kt
@@ -150,7 +150,7 @@ class GetMembersE2EICertificateStatusesUseCaseTest {
                 CryptoCertificateStatus.VALID,
                 "thumbprint",
                 "serialNumber",
-                endTimestamp = 1899105093
+                endTimestampSeconds = 1899105093
             )
     }
 }
diff --git a/...kotlin/com/wire/kalium/logic/feature/e2ei/GetUserE2eiAllCertificateStatusesUseCaseTest.kt b/...kotlin/com/wire/kalium/logic/feature/e2ei/GetUserE2eiAllCertificateStatusesUseCaseTest.kt
@@ -158,7 +158,7 @@ class GetUserE2eiAllCertificateStatusesUseCaseTest {
                 CryptoCertificateStatus.VALID,
                 "thumbprint",
                 serialNumber = "serialNumber",
-                endTimestamp = 1899105093
+                endTimestampSeconds = 1899105093
             )
     }
 }