Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

dep | Adapt rust-sdk, rename PreviouslyVerified to VerificationViolation

Browse source
This commit is contained in:
Valere 2024-10-04 12:37:33 +02:00
parent 2c7e84a44b
commit 0cc751d168
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageShieldView.kt
View file

@ -79,7 +79,7 @@ internal fun MessageShield.toText(): String {
is MessageShield.UnsignedDevice -> CommonStrings.event_shield_reason_unsigned_device is MessageShield.UnsignedDevice -> CommonStrings.event_shield_reason_unsigned_device
is MessageShield.UnverifiedIdentity -> CommonStrings.event_shield_reason_unverified_identity is MessageShield.UnverifiedIdentity -> CommonStrings.event_shield_reason_unverified_identity
is MessageShield.SentInClear -> CommonStrings.event_shield_reason_sent_in_clear is MessageShield.SentInClear -> CommonStrings.event_shield_reason_sent_in_clear
is MessageShield.PreviouslyVerified -> CommonStrings.event_shield_reason_previously_verified is MessageShield.VerificationViolation -> CommonStrings.event_shield_reason_previously_verified
} }
) )
} }
@ -91,7 +91,7 @@ internal fun MessageShield.toIcon(): ImageVector {
is MessageShield.UnknownDevice, is MessageShield.UnknownDevice,
is MessageShield.UnsignedDevice, is MessageShield.UnsignedDevice,
is MessageShield.UnverifiedIdentity, is MessageShield.UnverifiedIdentity,
is MessageShield.PreviouslyVerified -> CompoundIcons.HelpSolid() is MessageShield.VerificationViolation -> CompoundIcons.HelpSolid()
is MessageShield.SentInClear -> CompoundIcons.LockOff() is MessageShield.SentInClear -> CompoundIcons.LockOff()
} }
} }
@ -120,7 +120,7 @@ internal fun MessageShieldViewPreview() {
shield = MessageShield.SentInClear(false) shield = MessageShield.SentInClear(false)
) )
MessageShieldView( MessageShieldView(
shield = MessageShield.PreviouslyVerified(false) shield = MessageShield.VerificationViolation(false)
) )
} }
} }

6
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageShield.kt
View file

@ -26,8 +26,8 @@ sealed interface MessageShield {
/** An unencrypted event in an encrypted room. */ /** An unencrypted event in an encrypted room. */
data class SentInClear(val isCritical: Boolean) : MessageShield data class SentInClear(val isCritical: Boolean) : MessageShield
/** The sender was previously verified but changed their identity. */ /** The sender was previously verified but is not anymore. */
data class PreviouslyVerified(val isCritical: Boolean) : MessageShield data class VerificationViolation(val isCritical: Boolean) : MessageShield
} }
val MessageShield.isCritical: Boolean val MessageShield.isCritical: Boolean
@ -37,5 +37,5 @@ val MessageShield.isCritical: Boolean
is MessageShield.UnsignedDevice -> isCritical is MessageShield.UnsignedDevice -> isCritical
is MessageShield.UnverifiedIdentity -> isCritical is MessageShield.UnverifiedIdentity -> isCritical
is MessageShield.SentInClear -> isCritical is MessageShield.SentInClear -> isCritical
is MessageShield.PreviouslyVerified -> isCritical is MessageShield.VerificationViolation -> isCritical
} }

2
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt
View file

@ -164,7 +164,7 @@ private fun ShieldState?.map(): MessageShield? {
ShieldStateCode.UNSIGNED_DEVICE -> MessageShield.UnsignedDevice(isCritical) ShieldStateCode.UNSIGNED_DEVICE -> MessageShield.UnsignedDevice(isCritical)
ShieldStateCode.UNVERIFIED_IDENTITY -> MessageShield.UnverifiedIdentity(isCritical) ShieldStateCode.UNVERIFIED_IDENTITY -> MessageShield.UnverifiedIdentity(isCritical)
ShieldStateCode.SENT_IN_CLEAR -> MessageShield.SentInClear(isCritical) ShieldStateCode.SENT_IN_CLEAR -> MessageShield.SentInClear(isCritical)
ShieldStateCode.PREVIOUSLY_VERIFIED -> MessageShield.PreviouslyVerified(isCritical) ShieldStateCode.VERIFICATION_VIOLATION -> MessageShield.VerificationViolation(isCritical)
} }
} }