Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: breaking changes from kalium #2778

Merged
merged 1 commit into from
Mar 11, 2024
Merged

fix: breaking changes from kalium #2778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions app/src/main/kotlin/com/wire/android/ui/settings/devices/EndToEndIdentityCertificateItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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 = {},
Expand All @@ -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 = {},
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/kotlin/com/wire/android/ui/settings/devices/model/DeviceDetailsState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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,
Expand Down