fix: breaking changes from kalium (#2779)

Co-authored-by: Mohamad Jaara <[email protected]> Co-authored-by: Oussama Hassine <[email protected]> Co-authored-by: Michał Saleniuk <[email protected]>
wireapp · Mar 15, 2024 · 2ff2e04 · 2ff2e04
1 parent f881a15
commit 2ff2e04
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/EndToEndIdentityCertificateItem.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/EndToEndIdentityCertificateItem.kt
@@ -42,6 +42,7 @@ import com.wire.android.ui.theme.wireTypography
 import com.wire.android.util.ui.PreviewMultipleThemes
 import com.wire.kalium.logic.feature.e2ei.CertificateStatus
 import com.wire.kalium.logic.feature.e2ei.E2eiCertificate
+import kotlinx.datetime.Instant
 
 @Composable
 fun EndToEndIdentityCertificateItem(
@@ -200,7 +201,8 @@ fun PreviewEndToEndIdentityCertificateItem() {
         certificate = E2eiCertificate(
             status = CertificateStatus.VALID,
             serialNumber = "e5:d5:e6:75:7e:04:86:07:14:3c:a0:ed:9a:8d:e4:fd",
-            certificateDetail = ""
+            certificateDetail = "",
+            endAt = Instant.DISTANT_FUTURE
         ),
         isLoadingCertificate = false,
         enrollE2eiCertificate = {},
@@ -217,7 +219,8 @@ fun PreviewEndToEndIdentityCertificateSelfItem() {
         certificate = E2eiCertificate(
             status = CertificateStatus.VALID,
             serialNumber = "e5:d5:e6:75:7e:04:86:07:14:3c:a0:ed:9a:8d:e4:fd",
-            certificateDetail = ""
+            certificateDetail = "",
+            endAt = Instant.DISTANT_FUTURE
         ),
         isLoadingCertificate = false,
         enrollE2eiCertificate = {},

diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/model/DeviceDetailsState.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/model/DeviceDetailsState.kt
@@ -22,6 +22,7 @@ import com.wire.android.ui.authentication.devices.remove.RemoveDeviceDialogState
 import com.wire.android.ui.authentication.devices.remove.RemoveDeviceError
 import com.wire.kalium.logic.feature.e2ei.CertificateStatus
 import com.wire.kalium.logic.feature.e2ei.E2eiCertificate
+import kotlinx.datetime.Instant
 
 data class DeviceDetailsState(
     val device: Device = Device(),
@@ -35,7 +36,8 @@ data class DeviceDetailsState(
     val e2eiCertificate: E2eiCertificate = E2eiCertificate(
         status = CertificateStatus.EXPIRED,
         serialNumber = "",
-        certificateDetail = ""
+        certificateDetail = "",
+        endAt = Instant.DISTANT_FUTURE
     ),
     val canBeRemoved: Boolean = false,
     val isLoadingCertificate: Boolean = false,

diff --git a/kalium b/kalium
+2 −1		cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/MLSClientImpl.kt
+2 −1		cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/IDs.kt
+1 −1		gradle/libs.versions.toml
+18 −12		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/e2ei/E2EIRepository.kt
+0 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+16 −2		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/E2eiCertificate.kt
+0 −5		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/CheckRevocationListUseCase.kt
+4 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/EnrollE2EIUseCase.kt
+2 −10		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/GetE2EICertificateUseCase.kt
+1 −5		...rc/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/GetMembersE2EICertificateStatusesUseCase.kt
+1 −5		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/GetUserE2EIAllCertificatesUseCase.kt
+33 −16		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/user/ObserveE2EIRequiredUseCase.kt
+2 −1		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt
+16 −15		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/e2ei/E2EIRepositoryTest.kt
+52 −3		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/client/ObserveE2EIRequiredUseCaseTest.kt
+8 −4		...onTest/kotlin/com/wire/kalium/logic/feature/conversation/MLSConversationsVerificationStatusesHandlerTest.kt
+13 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/EnrollE2EICertificateUseCaseTest.kt
+22 −5		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/GetE2eiCertificateUseCaseTest.kt
+2 −7		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/GetMembersE2EICertificateStatusesUseCaseTest.kt
+6 −3		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/GetUserE2eiAllCertificateStatusesUseCaseTest.kt
+2 −7		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/GetUserE2eiCertificateStatusUseCaseTest.kt
+0 −14		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/CheckRevocationListUseCaseTest.kt
+1 −1		...rc/commonTest/kotlin/com/wire/kalium/logic/util/arrangement/repository/ConversationRepositoryArrangement.kt
+12 −4		network/src/commonMain/kotlin/com/wire/kalium/network/api/base/unbound/acme/ACMEApi.kt
+6 −0		network/src/commonMain/kotlin/com/wire/kalium/network/api/base/unbound/acme/ACMEResponse.kt
+22 −0		network/src/commonTest/kotlin/com/wire/kalium/api/common/ACMEApiTest.kt