Skip to content

Commit

Permalink
Merge pull request #3602 from element-hq/feature/valere/bump_rust_sdk…
Browse files Browse the repository at this point in the history
…_0.2.51

dependency: Bump rust sdk to 0.2.51
  • Loading branch information
BillCarsonFr authored Oct 4, 2024
2 parents f9cdb5a + 2230163 commit 8021261
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ internal fun MessageShield.toText(): String {
is MessageShield.UnsignedDevice -> CommonStrings.event_shield_reason_unsigned_device
is MessageShield.UnverifiedIdentity -> CommonStrings.event_shield_reason_unverified_identity
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
}
)
}
Expand All @@ -91,7 +91,7 @@ internal fun MessageShield.toIcon(): ImageVector {
is MessageShield.UnknownDevice,
is MessageShield.UnsignedDevice,
is MessageShield.UnverifiedIdentity,
is MessageShield.PreviouslyVerified -> CompoundIcons.HelpSolid()
is MessageShield.VerificationViolation -> CompoundIcons.HelpSolid()
is MessageShield.SentInClear -> CompoundIcons.LockOff()
}
}
Expand Down Expand Up @@ -120,7 +120,7 @@ internal fun MessageShieldViewPreview() {
shield = MessageShield.SentInClear(false)
)
MessageShieldView(
shield = MessageShield.PreviouslyVerified(false)
shield = MessageShield.VerificationViolation(false)
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ jsoup = "org.jsoup:jsoup:1.18.1"
appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0"
timber = "com.jakewharton.timber:timber:5.0.1"
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.50"
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.51"
matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ sealed interface MessageShield {
/** An unencrypted event in an encrypted room. */
data class SentInClear(val isCritical: Boolean) : MessageShield

/** The sender was previously verified but changed their identity. */
data class PreviouslyVerified(val isCritical: Boolean) : MessageShield
/** The sender was previously verified but is not anymore. */
data class VerificationViolation(val isCritical: Boolean) : MessageShield
}

val MessageShield.isCritical: Boolean
Expand All @@ -37,5 +37,5 @@ val MessageShield.isCritical: Boolean
is MessageShield.UnsignedDevice -> isCritical
is MessageShield.UnverifiedIdentity -> isCritical
is MessageShield.SentInClear -> isCritical
is MessageShield.PreviouslyVerified -> isCritical
is MessageShield.VerificationViolation -> isCritical
}
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ private fun ShieldState?.map(): MessageShield? {
ShieldStateCode.UNSIGNED_DEVICE -> MessageShield.UnsignedDevice(isCritical)
ShieldStateCode.UNVERIFIED_IDENTITY -> MessageShield.UnverifiedIdentity(isCritical)
ShieldStateCode.SENT_IN_CLEAR -> MessageShield.SentInClear(isCritical)
ShieldStateCode.PREVIOUSLY_VERIFIED -> MessageShield.PreviouslyVerified(isCritical)
ShieldStateCode.VERIFICATION_VIOLATION -> MessageShield.VerificationViolation(isCritical)
}
}

Expand Down

0 comments on commit 8021261

Please sign in to comment.