Update dependency org.matrix.rustcomponents:sdk-android to v26.05.20 (#6831)
* Update dependency org.matrix.rustcomponents:sdk-android to v26.05.20 * Fix API breaks: - Handle new `ClientBuildException.InvalidRawKey` variant. - `RoomInfo` now has a `fullyReadEventId` . --------- 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
7d2ba03924
commit
550c0417dc
9 changed files with 15 additions and 1 deletions
|
|
@ -140,6 +140,7 @@ private fun aSpaceInfo(
|
||||||
privilegedCreatorRole = false,
|
privilegedCreatorRole = false,
|
||||||
isLowPriority = false,
|
isLowPriority = false,
|
||||||
activeCallIntentConsensus = CallIntentConsensus.None,
|
activeCallIntentConsensus = CallIntentConsensus.None,
|
||||||
|
fullyReadEventId = null,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -179,7 +179,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:26.05.18"
|
matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.05.20"
|
||||||
|
|
||||||
# Others
|
# Others
|
||||||
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
|
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,7 @@ data class RoomInfo(
|
||||||
val privilegedCreatorRole: Boolean,
|
val privilegedCreatorRole: Boolean,
|
||||||
val isLowPriority: Boolean,
|
val isLowPriority: Boolean,
|
||||||
val activeCallIntentConsensus: CallIntentConsensus,
|
val activeCallIntentConsensus: CallIntentConsensus,
|
||||||
|
val fullyReadEventId: EventId?,
|
||||||
) {
|
) {
|
||||||
val aliases: List<RoomAlias>
|
val aliases: List<RoomAlias>
|
||||||
get() = listOfNotNull(canonicalAlias) + alternativeAliases
|
get() = listOfNotNull(canonicalAlias) + alternativeAliases
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@ fun Throwable.mapAuthenticationException(): AuthenticationException {
|
||||||
}
|
}
|
||||||
is ClientBuildException.WellKnownLookupFailed -> AuthenticationException.Generic(message)
|
is ClientBuildException.WellKnownLookupFailed -> AuthenticationException.Generic(message)
|
||||||
is ClientBuildException.EventCache -> AuthenticationException.Generic(message)
|
is ClientBuildException.EventCache -> AuthenticationException.Generic(message)
|
||||||
|
is ClientBuildException.InvalidRawKey -> AuthenticationException.Generic(message)
|
||||||
}
|
}
|
||||||
is OAuthException -> when (this) {
|
is OAuthException -> when (this) {
|
||||||
is OAuthException.Generic -> AuthenticationException.OAuth(message)
|
is OAuthException.Generic -> AuthenticationException.OAuth(message)
|
||||||
|
|
|
||||||
|
|
@ -77,6 +77,7 @@ class RoomInfoMapper {
|
||||||
privilegedCreatorRole = it.privilegedCreatorsRole,
|
privilegedCreatorRole = it.privilegedCreatorsRole,
|
||||||
isLowPriority = it.isLowPriority,
|
isLowPriority = it.isLowPriority,
|
||||||
activeCallIntentConsensus = it.activeRoomCallConsensusIntent.map(),
|
activeCallIntentConsensus = it.activeRoomCallConsensusIntent.map(),
|
||||||
|
fullyReadEventId = it.fullyReadEventId?.let(::EventId)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,7 @@ internal fun aRustRoomInfo(
|
||||||
activeRoomCallConsensusIntent: RtcCallIntentConsensus = RtcCallIntentConsensus.None,
|
activeRoomCallConsensusIntent: RtcCallIntentConsensus = RtcCallIntentConsensus.None,
|
||||||
activeServiceMembersCount: Int = 0,
|
activeServiceMembersCount: Int = 0,
|
||||||
isDm: Boolean = false,
|
isDm: Boolean = false,
|
||||||
|
fullyReadEventId: String? = null,
|
||||||
) = RoomInfo(
|
) = RoomInfo(
|
||||||
id = id,
|
id = id,
|
||||||
displayName = displayName,
|
displayName = displayName,
|
||||||
|
|
@ -105,4 +106,5 @@ internal fun aRustRoomInfo(
|
||||||
activeRoomCallConsensusIntent = activeRoomCallConsensusIntent,
|
activeRoomCallConsensusIntent = activeRoomCallConsensusIntent,
|
||||||
activeServiceMembersCount = activeServiceMembersCount.toULong(),
|
activeServiceMembersCount = activeServiceMembersCount.toULong(),
|
||||||
isDm = isDm,
|
isDm = isDm,
|
||||||
|
fullyReadEventId = fullyReadEventId,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -87,6 +87,7 @@ class RoomInfoMapperTest {
|
||||||
isLowPriority = true,
|
isLowPriority = true,
|
||||||
activeRoomCallConsensusIntent = RtcCallIntentConsensus.Full(RtcCallIntent.AUDIO),
|
activeRoomCallConsensusIntent = RtcCallIntentConsensus.Full(RtcCallIntent.AUDIO),
|
||||||
isDm = true,
|
isDm = true,
|
||||||
|
fullyReadEventId = AN_EVENT_ID.value,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
).isEqualTo(
|
).isEqualTo(
|
||||||
|
|
@ -138,6 +139,7 @@ class RoomInfoMapperTest {
|
||||||
isLowPriority = true,
|
isLowPriority = true,
|
||||||
activeCallIntentConsensus = CallIntentConsensus.Full(CallIntent.AUDIO),
|
activeCallIntentConsensus = CallIntentConsensus.Full(CallIntent.AUDIO),
|
||||||
isDm = true,
|
isDm = true,
|
||||||
|
fullyReadEventId = AN_EVENT_ID,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
@ -184,6 +186,7 @@ class RoomInfoMapperTest {
|
||||||
isLowPriority = true,
|
isLowPriority = true,
|
||||||
activeRoomCallConsensusIntent = RtcCallIntentConsensus.None,
|
activeRoomCallConsensusIntent = RtcCallIntentConsensus.None,
|
||||||
isDm = false,
|
isDm = false,
|
||||||
|
fullyReadEventId = AN_EVENT_ID.value,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
).isEqualTo(
|
).isEqualTo(
|
||||||
|
|
@ -229,6 +232,7 @@ class RoomInfoMapperTest {
|
||||||
isLowPriority = true,
|
isLowPriority = true,
|
||||||
activeCallIntentConsensus = CallIntentConsensus.None,
|
activeCallIntentConsensus = CallIntentConsensus.None,
|
||||||
isDm = false,
|
isDm = false,
|
||||||
|
fullyReadEventId = AN_EVENT_ID,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -72,6 +72,7 @@ fun aRoomInfo(
|
||||||
isLowPriority: Boolean = false,
|
isLowPriority: Boolean = false,
|
||||||
activeCallIntentConsensus: CallIntentConsensus = CallIntentConsensus.None,
|
activeCallIntentConsensus: CallIntentConsensus = CallIntentConsensus.None,
|
||||||
isDm: Boolean = false,
|
isDm: Boolean = false,
|
||||||
|
fullyReadEventId: EventId? = null,
|
||||||
) = RoomInfo(
|
) = RoomInfo(
|
||||||
id = id,
|
id = id,
|
||||||
name = name,
|
name = name,
|
||||||
|
|
@ -111,4 +112,5 @@ fun aRoomInfo(
|
||||||
isLowPriority = isLowPriority,
|
isLowPriority = isLowPriority,
|
||||||
activeCallIntentConsensus = activeCallIntentConsensus,
|
activeCallIntentConsensus = activeCallIntentConsensus,
|
||||||
isDm = isDm,
|
isDm = isDm,
|
||||||
|
fullyReadEventId = fullyReadEventId,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,7 @@ fun aRoomSummary(
|
||||||
privilegedCreatorRole: Boolean = false,
|
privilegedCreatorRole: Boolean = false,
|
||||||
isLowPriority: Boolean = false,
|
isLowPriority: Boolean = false,
|
||||||
activeCallIntentConsensus: CallIntentConsensus = CallIntentConsensus.None,
|
activeCallIntentConsensus: CallIntentConsensus = CallIntentConsensus.None,
|
||||||
|
fullyReadEventId: EventId? = null,
|
||||||
) = RoomSummary(
|
) = RoomSummary(
|
||||||
info = RoomInfo(
|
info = RoomInfo(
|
||||||
id = roomId,
|
id = roomId,
|
||||||
|
|
@ -121,6 +122,7 @@ fun aRoomSummary(
|
||||||
isLowPriority = isLowPriority,
|
isLowPriority = isLowPriority,
|
||||||
activeCallIntentConsensus = activeCallIntentConsensus,
|
activeCallIntentConsensus = activeCallIntentConsensus,
|
||||||
isDm = false,
|
isDm = false,
|
||||||
|
fullyReadEventId = fullyReadEventId,
|
||||||
),
|
),
|
||||||
latestEvent = latestEvent,
|
latestEvent = latestEvent,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue