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

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

Browse source 
Update dependency org.matrix.rustcomponents:sdk-android to v26.03.4
This commit is contained in:
ganfra 2026-03-05 15:59:16 +01:00 • committed by GitHub
commit ef204ea46f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt
View file

@ -167,6 +167,6 @@ class LoggedInPresenter(
private fun CoroutineScope.preloadAccountManagementUrl() = launch { private fun CoroutineScope.preloadAccountManagementUrl() = launch {
matrixClient.getAccountManagementUrl(AccountManagementAction.Profile) matrixClient.getAccountManagementUrl(AccountManagementAction.Profile)
matrixClient.getAccountManagementUrl(AccountManagementAction.SessionsList) matrixClient.getAccountManagementUrl(AccountManagementAction.DevicesList)
} }
} }

2
appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt
View file

@ -81,7 +81,7 @@ class LoggedInPresenterTest {
accountManagementUrlResult.assertions().isCalledExactly(2) accountManagementUrlResult.assertions().isCalledExactly(2)
.withSequence( .withSequence(
listOf(value(AccountManagementAction.Profile)), listOf(value(AccountManagementAction.Profile)),
listOf(value(AccountManagementAction.SessionsList)), listOf(value(AccountManagementAction.DevicesList)),
) )
} }
} }

2
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt
View file

@ -165,6 +165,6 @@ class PreferencesRootPresenter(
devicesManagementUrl: MutableState<String?>, devicesManagementUrl: MutableState<String?>,
) = launch { ) = launch {
accountManagementUrl.value = matrixClient.getAccountManagementUrl(AccountManagementAction.Profile).getOrNull() accountManagementUrl.value = matrixClient.getAccountManagementUrl(AccountManagementAction.Profile).getOrNull()
devicesManagementUrl.value = matrixClient.getAccountManagementUrl(AccountManagementAction.SessionsList).getOrNull() devicesManagementUrl.value = matrixClient.getAccountManagementUrl(AccountManagementAction.DevicesList).getOrNull()
} }
} }

4
features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt
View file

@ -98,10 +98,10 @@ class PreferencesRootPresenterTest {
accountManagementUrlResult.assertions().isCalledExactly(2) accountManagementUrlResult.assertions().isCalledExactly(2)
.withSequence( .withSequence(
listOf(value(AccountManagementAction.Profile)), listOf(value(AccountManagementAction.Profile)),
listOf(value(AccountManagementAction.SessionsList)), listOf(value(AccountManagementAction.DevicesList)),
) )
assertThat(finalState.accountManagementUrl).isEqualTo("Profile url") assertThat(finalState.accountManagementUrl).isEqualTo("Profile url")
assertThat(finalState.devicesManagementUrl).isEqualTo("SessionsList url") assertThat(finalState.devicesManagementUrl).isEqualTo("DevicesList url")
} }
} }

2
gradle/libs.versions.toml
View file

@ -178,7 +178,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.03.1" matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.03.4"
# Others # Others
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" } coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }

6
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/oidc/AccountManagementAction.kt
View file

@ -12,7 +12,7 @@ import io.element.android.libraries.matrix.api.core.DeviceId
sealed interface AccountManagementAction { sealed interface AccountManagementAction {
data object Profile : AccountManagementAction data object Profile : AccountManagementAction
data object SessionsList : AccountManagementAction data object DevicesList : AccountManagementAction
data class SessionView(val deviceId: DeviceId) : AccountManagementAction data class DeviceView(val deviceId: DeviceId) : AccountManagementAction
data class SessionEnd(val deviceId: DeviceId) : AccountManagementAction data class DeviceDelete(val deviceId: DeviceId) : AccountManagementAction
} }

6
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementAction.kt
View file

@ -14,8 +14,8 @@ import org.matrix.rustcomponents.sdk.AccountManagementAction as RustAccountManag
fun AccountManagementAction.toRustAction(): RustAccountManagementAction { fun AccountManagementAction.toRustAction(): RustAccountManagementAction {
return when (this) { return when (this) {
AccountManagementAction.Profile -> RustAccountManagementAction.Profile AccountManagementAction.Profile -> RustAccountManagementAction.Profile
is AccountManagementAction.SessionEnd -> RustAccountManagementAction.SessionEnd(deviceId.value) is AccountManagementAction.DeviceDelete -> RustAccountManagementAction.DeviceDelete(deviceId.value)
is AccountManagementAction.SessionView -> RustAccountManagementAction.SessionView(deviceId.value) is AccountManagementAction.DeviceView -> RustAccountManagementAction.DeviceView(deviceId.value)
AccountManagementAction.SessionsList -> RustAccountManagementAction.SessionsList AccountManagementAction.DevicesList -> RustAccountManagementAction.DevicesList
} }
} }

12
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementActionKtTest.kt
View file

@ -19,11 +19,11 @@ class AccountManagementActionKtTest {
fun `test AccountManagementAction to RustAccountManagementAction`() { fun `test AccountManagementAction to RustAccountManagementAction`() {
assertThat(AccountManagementAction.Profile.toRustAction()) assertThat(AccountManagementAction.Profile.toRustAction())
.isEqualTo(RustAccountManagementAction.Profile) .isEqualTo(RustAccountManagementAction.Profile)
assertThat(AccountManagementAction.SessionEnd(A_DEVICE_ID).toRustAction()) assertThat(AccountManagementAction.DeviceDelete(A_DEVICE_ID).toRustAction())
.isEqualTo(RustAccountManagementAction.SessionEnd(A_DEVICE_ID.value)) .isEqualTo(RustAccountManagementAction.DeviceDelete(A_DEVICE_ID.value))
assertThat(AccountManagementAction.SessionView(A_DEVICE_ID).toRustAction()) assertThat(AccountManagementAction.DeviceView(A_DEVICE_ID).toRustAction())
.isEqualTo(RustAccountManagementAction.SessionView(A_DEVICE_ID.value)) .isEqualTo(RustAccountManagementAction.DeviceView(A_DEVICE_ID.value))
assertThat(AccountManagementAction.SessionsList.toRustAction()) assertThat(AccountManagementAction.DevicesList.toRustAction())
.isEqualTo(RustAccountManagementAction.SessionsList) .isEqualTo(RustAccountManagementAction.DevicesList)
} }
} }