fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v26 (#5977)
* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v26 * Fix API breaks: `ShieldStateCode` is now `TimelineEventShieldStateCode` --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín <jorgem@element.io>
This commit is contained in:
parent
d67aee23c3
commit
ac594b35d6
4 changed files with 17 additions and 13 deletions
|
|
@ -177,7 +177,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version
|
||||||
# https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
|
# https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
|
||||||
# All new features should not be implemented in the pull request that upgrades the version, developers should
|
# All new features should not be implemented in the pull request that upgrades the version, developers should
|
||||||
# only fix API breaks and may add some TODOs.
|
# only fix API breaks and may add some TODOs.
|
||||||
matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.12.19"
|
matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.1.7"
|
||||||
|
|
||||||
# Others
|
# Others
|
||||||
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
|
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ import org.matrix.rustcomponents.sdk.QueueWedgeError
|
||||||
import org.matrix.rustcomponents.sdk.Reaction
|
import org.matrix.rustcomponents.sdk.Reaction
|
||||||
import org.matrix.rustcomponents.sdk.ShieldState
|
import org.matrix.rustcomponents.sdk.ShieldState
|
||||||
import org.matrix.rustcomponents.sdk.TimelineItemContent
|
import org.matrix.rustcomponents.sdk.TimelineItemContent
|
||||||
import uniffi.matrix_sdk_common.ShieldStateCode
|
import uniffi.matrix_sdk_ui.TimelineEventShieldStateCode
|
||||||
import org.matrix.rustcomponents.sdk.EventSendState as RustEventSendState
|
import org.matrix.rustcomponents.sdk.EventSendState as RustEventSendState
|
||||||
import org.matrix.rustcomponents.sdk.EventTimelineItem as RustEventTimelineItem
|
import org.matrix.rustcomponents.sdk.EventTimelineItem as RustEventTimelineItem
|
||||||
import org.matrix.rustcomponents.sdk.EventTimelineItemDebugInfo as RustEventTimelineItemDebugInfo
|
import org.matrix.rustcomponents.sdk.EventTimelineItemDebugInfo as RustEventTimelineItemDebugInfo
|
||||||
|
|
@ -58,7 +58,7 @@ class EventTimelineItemMapper(
|
||||||
content = contentMapper.map(content),
|
content = contentMapper.map(content),
|
||||||
origin = origin?.map(),
|
origin = origin?.map(),
|
||||||
timelineItemDebugInfoProvider = { lazyProvider.debugInfo().map() },
|
timelineItemDebugInfoProvider = { lazyProvider.debugInfo().map() },
|
||||||
messageShieldProvider = { strict -> lazyProvider.getShields(strict)?.map() },
|
messageShieldProvider = { strict -> lazyProvider.getShields(strict).map() },
|
||||||
sendHandleProvider = { lazyProvider.getSendHandle()?.let(::RustSendHandle) }
|
sendHandleProvider = { lazyProvider.getSendHandle()?.let(::RustSendHandle) }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
@ -182,13 +182,13 @@ private fun ShieldState?.map(): MessageShield? {
|
||||||
is ShieldState.Red -> true
|
is ShieldState.Red -> true
|
||||||
}
|
}
|
||||||
return when (shieldStateCode) {
|
return when (shieldStateCode) {
|
||||||
ShieldStateCode.AUTHENTICITY_NOT_GUARANTEED -> MessageShield.AuthenticityNotGuaranteed(isCritical)
|
TimelineEventShieldStateCode.AUTHENTICITY_NOT_GUARANTEED -> MessageShield.AuthenticityNotGuaranteed(isCritical)
|
||||||
ShieldStateCode.UNKNOWN_DEVICE -> MessageShield.UnknownDevice(isCritical)
|
TimelineEventShieldStateCode.UNKNOWN_DEVICE -> MessageShield.UnknownDevice(isCritical)
|
||||||
ShieldStateCode.UNSIGNED_DEVICE -> MessageShield.UnsignedDevice(isCritical)
|
TimelineEventShieldStateCode.UNSIGNED_DEVICE -> MessageShield.UnsignedDevice(isCritical)
|
||||||
ShieldStateCode.UNVERIFIED_IDENTITY -> MessageShield.UnverifiedIdentity(isCritical)
|
TimelineEventShieldStateCode.UNVERIFIED_IDENTITY -> MessageShield.UnverifiedIdentity(isCritical)
|
||||||
ShieldStateCode.SENT_IN_CLEAR -> MessageShield.SentInClear(isCritical)
|
TimelineEventShieldStateCode.SENT_IN_CLEAR -> MessageShield.SentInClear(isCritical)
|
||||||
ShieldStateCode.VERIFICATION_VIOLATION -> MessageShield.VerificationViolation(isCritical)
|
TimelineEventShieldStateCode.VERIFICATION_VIOLATION -> MessageShield.VerificationViolation(isCritical)
|
||||||
ShieldStateCode.MISMATCHED_SENDER -> MessageShield.MismatchedSender(isCritical)
|
TimelineEventShieldStateCode.MISMATCHED_SENDER -> MessageShield.MismatchedSender(isCritical)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,8 +35,10 @@ internal fun aRustEventTimelineItem(
|
||||||
readReceipts: Map<String, Receipt> = emptyMap(),
|
readReceipts: Map<String, Receipt> = emptyMap(),
|
||||||
origin: EventItemOrigin? = EventItemOrigin.SYNC,
|
origin: EventItemOrigin? = EventItemOrigin.SYNC,
|
||||||
canBeRepliedTo: Boolean = true,
|
canBeRepliedTo: Boolean = true,
|
||||||
shieldsState: ShieldState? = null,
|
shieldsState: ShieldState = ShieldState.None,
|
||||||
localCreatedAt: ULong? = null,
|
localCreatedAt: ULong? = null,
|
||||||
|
forwarder: String? = null,
|
||||||
|
forwarderProfile: ProfileDetails? = null,
|
||||||
) = EventTimelineItem(
|
) = EventTimelineItem(
|
||||||
isRemote = isRemote,
|
isRemote = isRemote,
|
||||||
eventOrTransactionId = eventOrTransactionId,
|
eventOrTransactionId = eventOrTransactionId,
|
||||||
|
|
@ -54,5 +56,7 @@ internal fun aRustEventTimelineItem(
|
||||||
lazyProvider = FakeFfiLazyTimelineItemProvider(
|
lazyProvider = FakeFfiLazyTimelineItemProvider(
|
||||||
debugInfo = debugInfo,
|
debugInfo = debugInfo,
|
||||||
shieldsState = shieldsState,
|
shieldsState = shieldsState,
|
||||||
)
|
),
|
||||||
|
forwarder = forwarder,
|
||||||
|
forwarderProfile = forwarderProfile,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ import org.matrix.rustcomponents.sdk.ShieldState
|
||||||
|
|
||||||
class FakeFfiLazyTimelineItemProvider(
|
class FakeFfiLazyTimelineItemProvider(
|
||||||
private val debugInfo: EventTimelineItemDebugInfo = anEventTimelineItemDebugInfo(),
|
private val debugInfo: EventTimelineItemDebugInfo = anEventTimelineItemDebugInfo(),
|
||||||
private val shieldsState: ShieldState? = null,
|
private val shieldsState: ShieldState = ShieldState.None,
|
||||||
) : LazyTimelineItemProvider(NoHandle) {
|
) : LazyTimelineItemProvider(NoHandle) {
|
||||||
override fun getShields(strict: Boolean) = shieldsState
|
override fun getShields(strict: Boolean) = shieldsState
|
||||||
override fun debugInfo() = debugInfo
|
override fun debugInfo() = debugInfo
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue