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

Merge pull request #2417 from element-hq/renovate/org.matrix.rustcomponents-sdk-android-0.x

Browse source 
Update dependency org.matrix.rustcomponents:sdk-android to v0.2.3
This commit is contained in:
ganfra 2024-02-19 22:43:54 +01:00 • committed by GitHub
commit cc721b6c87
6 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle/libs.versions.toml
View file

@ -152,7 +152,7 @@ jsoup = "org.jsoup:jsoup:1.17.2"
appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" } appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
molecule-runtime = "app.cash.molecule:molecule-runtime:1.3.2" molecule-runtime = "app.cash.molecule:molecule-runtime:1.3.2"
timber = "com.jakewharton.timber:timber:5.0.1" timber = "com.jakewharton.timber:timber:5.0.1"
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.2" matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.3"
matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" } matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", 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" } sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

2
libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt
View file

@ -170,7 +170,7 @@ class StateContentFormatter @Inject constructor(
"RoomPinnedEvents" "RoomPinnedEvents"
} }
} }
OtherState.RoomPowerLevels -> when (renderingMode) { is OtherState.RoomPowerLevels -> when (renderingMode) {
RenderingMode.RoomList -> { RenderingMode.RoomList -> {
Timber.v("Filtering timeline item for room state change: $content") Timber.v("Filtering timeline item for room state change: $content")
null null

18
libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt
View file

@ -641,9 +641,21 @@ class DefaultRoomLastMessageFormatterTest {
@Config(qualifiers = "en") @Config(qualifiers = "en")
fun `Room state change - others must return null`() { fun `Room state change - others must return null`() {
val otherStates = arrayOf( val otherStates = arrayOf(
OtherState.PolicyRuleRoom, OtherState.PolicyRuleServer, OtherState.PolicyRuleUser, OtherState.RoomAliases, OtherState.RoomCanonicalAlias, OtherState.PolicyRuleRoom,
OtherState.RoomGuestAccess, OtherState.RoomHistoryVisibility, OtherState.RoomJoinRules, OtherState.RoomPinnedEvents, OtherState.RoomPowerLevels, OtherState.PolicyRuleServer,
OtherState.RoomServerAcl, OtherState.RoomTombstone, OtherState.SpaceChild, OtherState.SpaceParent, OtherState.Custom("custom_event_type") OtherState.PolicyRuleUser,
OtherState.RoomAliases,
OtherState.RoomCanonicalAlias,
OtherState.RoomGuestAccess,
OtherState.RoomHistoryVisibility,
OtherState.RoomJoinRules,
OtherState.RoomPinnedEvents,
OtherState.RoomPowerLevels(emptyMap()),
OtherState.RoomServerAcl,
OtherState.RoomTombstone,
OtherState.SpaceChild,
OtherState.SpaceParent,
OtherState.Custom("custom_event_type")
) )
val results = otherStates.map { state -> val results = otherStates.map { state ->

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

@ -33,7 +33,7 @@ sealed interface OtherState {
data object RoomJoinRules : OtherState data object RoomJoinRules : OtherState
data class RoomName(val name: String?) : OtherState data class RoomName(val name: String?) : OtherState
data object RoomPinnedEvents : OtherState data object RoomPinnedEvents : OtherState
data object RoomPowerLevels : OtherState data class RoomPowerLevels(val users: Map<String, Long>) : OtherState
data object RoomServerAcl : OtherState data object RoomServerAcl : OtherState
data class RoomThirdPartyInvite(val displayName: String?) : OtherState data class RoomThirdPartyInvite(val displayName: String?) : OtherState
data object RoomTombstone : OtherState data object RoomTombstone : OtherState

1
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
View file

@ -65,6 +65,7 @@ class RustMatrixAuthenticationService @Inject constructor(
basePath = baseDirectory.absolutePath, basePath = baseDirectory.absolutePath,
passphrase = pendingPassphrase, passphrase = pendingPassphrase,
userAgent = userAgentProvider.provide(), userAgent = userAgentProvider.provide(),
additionalRootCertificates = emptyList(),
oidcConfiguration = oidcConfiguration, oidcConfiguration = oidcConfiguration,
customSlidingSyncProxy = null, customSlidingSyncProxy = null,
sessionDelegate = null, sessionDelegate = null,

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

@ -163,7 +163,7 @@ private fun RustOtherState.map(): OtherState {
RustOtherState.RoomJoinRules -> OtherState.RoomJoinRules RustOtherState.RoomJoinRules -> OtherState.RoomJoinRules
is RustOtherState.RoomName -> OtherState.RoomName(name) is RustOtherState.RoomName -> OtherState.RoomName(name)
RustOtherState.RoomPinnedEvents -> OtherState.RoomPinnedEvents RustOtherState.RoomPinnedEvents -> OtherState.RoomPinnedEvents
RustOtherState.RoomPowerLevels -> OtherState.RoomPowerLevels is RustOtherState.RoomPowerLevels -> OtherState.RoomPowerLevels(users)
RustOtherState.RoomServerAcl -> OtherState.RoomServerAcl RustOtherState.RoomServerAcl -> OtherState.RoomServerAcl
is RustOtherState.RoomThirdPartyInvite -> OtherState.RoomThirdPartyInvite(displayName) is RustOtherState.RoomThirdPartyInvite -> OtherState.RoomThirdPartyInvite(displayName)
RustOtherState.RoomTombstone -> OtherState.RoomTombstone RustOtherState.RoomTombstone -> OtherState.RoomTombstone