From 4fe142c62401ec57466ba81e289514d598b3a279 Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 4 Sep 2024 16:37:46 +0200 Subject: [PATCH] Rust sdk : update to 0.2.42 --- gradle/libs.versions.toml | 2 +- .../matrix/api/timeline/item/event/LocalEventSendState.kt | 2 ++ .../matrix/impl/timeline/item/event/EventTimelineItemMapper.kt | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3d92db06b6..25fc859578 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -162,7 +162,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.41" +matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.42" 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" } diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/LocalEventSendState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/LocalEventSendState.kt index 8e5f539d81..4df02a6df7 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/LocalEventSendState.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/LocalEventSendState.kt @@ -25,6 +25,8 @@ sealed interface LocalEventSendState { data object Sending : LocalEventSendState sealed interface Failed : LocalEventSendState { data class Unknown(val error: String) : Failed + data object CrossSigningNotSetup : Failed + data object SendingFromUnverifiedDevice : Failed data class VerifiedUserHasUnsignedDevice( /** * The unsigned devices belonging to verified users. A map from user ID diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt index d51e4bf3c8..17b1493c86 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt @@ -31,6 +31,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemE import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList +import org.matrix.rustcomponents.sdk.EventSendState import org.matrix.rustcomponents.sdk.Reaction import org.matrix.rustcomponents.sdk.ShieldState import uniffi.matrix_sdk_common.ShieldStateCode @@ -98,6 +99,8 @@ fun RustEventSendState?.map(): LocalEventSendState? { devices = devices.mapKeys { UserId(it.key) } ) } + EventSendState.CrossSigningNotSetup -> LocalEventSendState.Failed.CrossSigningNotSetup + EventSendState.SendingFromUnverifiedDevice -> LocalEventSendState.Failed.SendingFromUnverifiedDevice } }