Merge remote-tracking branch 'origin/release/candidate' into fix/hand…

…le_with_scheme_and_domain_from_corecrypto

# Conflicts:
#	cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/IDs.kt

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
 ) {
     val handleWithoutSchemeAtSignAndDomain: String
         get() = handle.substringAfter("://%40").removeSuffix("@$domain")

logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt

@@ -278,7 +278,7 @@ internal class MLSConversationDataSource(
             }
 
     override suspend fun requestToJoinGroup(groupID: GroupID, epoch: ULong): Either<CoreFailure, Unit> {
-        kaliumLogger.d("Requesting to re-join MLS group $groupID with epoch $epoch")
+        kaliumLogger.d("Requesting to re-join MLS group ${groupID.toLogString()} with epoch $epoch")
         return mlsClientProvider.getMLSClient().flatMap { mlsClient ->
             wrapMLSRequest {
                 mlsClient.joinConversation(idMapper.toCryptoModel(groupID), epoch)
@@ -301,7 +301,7 @@ internal class MLSConversationDataSource(
         groupID: GroupID,
         groupInfo: ByteArray
     ): Either<CoreFailure, Unit> = withContext(serialDispatcher) {
-        kaliumLogger.d("Requesting to re-join MLS group $groupID via external commit")
+        kaliumLogger.d("Requesting to re-join MLS group ${groupID.toLogString()} via external commit")
         mlsClientProvider.getMLSClient().flatMap { mlsClient ->
             wrapMLSRequest {
                 mlsClient.joinByExternalCommit(groupInfo)

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)
             )
     }
 }

logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/MLSMessageCreator.kt

@@ -57,7 +57,7 @@ class MLSMessageCreatorImpl(
 
     override suspend fun createOutgoingMLSMessage(groupId: GroupID, message: Message.Sendable): Either<CoreFailure, MLSMessageApi.Message> {
         return mlsClientProvider.getMLSClient().flatMap { mlsClient ->
-            kaliumLogger.i("Creating outgoing MLS message (groupID = $groupId)")
+            kaliumLogger.i("Creating outgoing MLS message (groupID = ${groupId.toLogString()})")
 
             val expectsReadConfirmation = when (message) {
                 is Message.Regular -> message.expectsReadConfirmation

logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/PendingProposalScheduler.kt

@@ -92,10 +92,10 @@ internal class PendingProposalSchedulerImpl(
     private suspend fun startCommittingPendingProposals() {
         kaliumLogger.d("Start listening for pending proposals to commit")
         timers().cancellable().collect() { groupID ->
-            kaliumLogger.d("Committing pending proposals in $groupID")
+            kaliumLogger.d("Committing pending proposals in ${groupID.toLogString()}")
             mlsConversationRepository.value.commitPendingProposals(groupID)
                 .onFailure {
-                    kaliumLogger.e("Failed to commit pending proposals in $groupID: $it")
+                    kaliumLogger.e("Failed to commit pending proposals in ${groupID.toLogString()}: $it")
                 }
         }
     }
@@ -120,7 +120,7 @@ internal class PendingProposalSchedulerImpl(
     }
 
     override suspend fun scheduleCommit(groupID: GroupID, date: Instant) {
-        kaliumLogger.d("Scheduling to commit pending proposals in $groupID at $date")
+        kaliumLogger.d("Scheduling to commit pending proposals in ${groupID.toLogString()} at $date")
         mlsConversationRepository.value.setProposalTimer(
             ProposalTimer(groupID, date),
             inMemory = subconversationRepository.value.containsSubconversation(groupID)

logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt

@@ -1934,7 +1934,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")

logic/src/commonTest/kotlin/com/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
                 )
             )
         )

logic/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
         )
     }
 }

logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/GetMembersE2EICertificateStatusesUseCaseTest.kt

@@ -150,7 +150,7 @@ class GetMembersE2EICertificateStatusesUseCaseTest {
                 CryptoCertificateStatus.VALID,
                 "thumbprint",
                 "serialNumber",
-                endTimestamp = 1899105093
+                endTimestampSeconds = 1899105093
             )
     }
 }

logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/GetUserE2eiAllCertificateStatusesUseCaseTest.kt

@@ -158,7 +158,7 @@ class GetUserE2eiAllCertificateStatusesUseCaseTest {
                 CryptoCertificateStatus.VALID,
                 "thumbprint",
                 serialNumber = "serialNumber",
-                endTimestamp = 1899105093
+                endTimestampSeconds = 1899105093
             )
     }
 }