From 1682ae88e7dd7f497174ad3bf770f996e78ba73b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 4 Mar 2026 17:41:44 +0100 Subject: [PATCH] Rename our classes too. --- .../io/element/android/appnav/loggedin/LoggedInPresenter.kt | 2 +- .../android/appnav/loggedin/LoggedInPresenterTest.kt | 2 +- .../preferences/impl/root/PreferencesRootPresenter.kt | 2 +- .../preferences/impl/root/PreferencesRootPresenterTest.kt | 2 +- .../libraries/matrix/api/oidc/AccountManagementAction.kt | 6 +++--- .../libraries/matrix/impl/oidc/AccountManagementAction.kt | 6 +++--- .../matrix/impl/oidc/AccountManagementActionKtTest.kt | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt index 184766e323..757dd73395 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt @@ -167,6 +167,6 @@ class LoggedInPresenter( private fun CoroutineScope.preloadAccountManagementUrl() = launch { matrixClient.getAccountManagementUrl(AccountManagementAction.Profile) - matrixClient.getAccountManagementUrl(AccountManagementAction.SessionsList) + matrixClient.getAccountManagementUrl(AccountManagementAction.DevicesList) } } diff --git a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt index 849dfa85b2..f1759eab3e 100644 --- a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt +++ b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt @@ -81,7 +81,7 @@ class LoggedInPresenterTest { accountManagementUrlResult.assertions().isCalledExactly(2) .withSequence( listOf(value(AccountManagementAction.Profile)), - listOf(value(AccountManagementAction.SessionsList)), + listOf(value(AccountManagementAction.DevicesList)), ) } } diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt index 59aa6ece8e..3d6a829167 100644 --- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt +++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt @@ -165,6 +165,6 @@ class PreferencesRootPresenter( devicesManagementUrl: MutableState, ) = launch { accountManagementUrl.value = matrixClient.getAccountManagementUrl(AccountManagementAction.Profile).getOrNull() - devicesManagementUrl.value = matrixClient.getAccountManagementUrl(AccountManagementAction.SessionsList).getOrNull() + devicesManagementUrl.value = matrixClient.getAccountManagementUrl(AccountManagementAction.DevicesList).getOrNull() } } diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt index d10f860f0d..c41550134a 100644 --- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt +++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt @@ -98,7 +98,7 @@ class PreferencesRootPresenterTest { accountManagementUrlResult.assertions().isCalledExactly(2) .withSequence( listOf(value(AccountManagementAction.Profile)), - listOf(value(AccountManagementAction.SessionsList)), + listOf(value(AccountManagementAction.DevicesList)), ) assertThat(finalState.accountManagementUrl).isEqualTo("Profile url") assertThat(finalState.devicesManagementUrl).isEqualTo("SessionsList url") diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/oidc/AccountManagementAction.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/oidc/AccountManagementAction.kt index 77e8854417..e1c7764e58 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/oidc/AccountManagementAction.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/oidc/AccountManagementAction.kt @@ -12,7 +12,7 @@ import io.element.android.libraries.matrix.api.core.DeviceId sealed interface AccountManagementAction { data object Profile : AccountManagementAction - data object SessionsList : AccountManagementAction - data class SessionView(val deviceId: DeviceId) : AccountManagementAction - data class SessionEnd(val deviceId: DeviceId) : AccountManagementAction + data object DevicesList : AccountManagementAction + data class DeviceView(val deviceId: DeviceId) : AccountManagementAction + data class DeviceDelete(val deviceId: DeviceId) : AccountManagementAction } diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementAction.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementAction.kt index 76e60e90f4..f86c57543a 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementAction.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementAction.kt @@ -14,8 +14,8 @@ import org.matrix.rustcomponents.sdk.AccountManagementAction as RustAccountManag fun AccountManagementAction.toRustAction(): RustAccountManagementAction { return when (this) { AccountManagementAction.Profile -> RustAccountManagementAction.Profile - is AccountManagementAction.SessionEnd -> RustAccountManagementAction.DeviceDelete(deviceId.value) - is AccountManagementAction.SessionView -> RustAccountManagementAction.DeviceView(deviceId.value) - AccountManagementAction.SessionsList -> RustAccountManagementAction.DevicesList + is AccountManagementAction.DeviceDelete -> RustAccountManagementAction.DeviceDelete(deviceId.value) + is AccountManagementAction.DeviceView -> RustAccountManagementAction.DeviceView(deviceId.value) + AccountManagementAction.DevicesList -> RustAccountManagementAction.DevicesList } } diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementActionKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementActionKtTest.kt index 0e0cab414e..3637ef78cc 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementActionKtTest.kt +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementActionKtTest.kt @@ -19,11 +19,11 @@ class AccountManagementActionKtTest { fun `test AccountManagementAction to RustAccountManagementAction`() { assertThat(AccountManagementAction.Profile.toRustAction()) .isEqualTo(RustAccountManagementAction.Profile) - assertThat(AccountManagementAction.SessionEnd(A_DEVICE_ID).toRustAction()) + assertThat(AccountManagementAction.DeviceDelete(A_DEVICE_ID).toRustAction()) .isEqualTo(RustAccountManagementAction.DeviceDelete(A_DEVICE_ID.value)) - assertThat(AccountManagementAction.SessionView(A_DEVICE_ID).toRustAction()) + assertThat(AccountManagementAction.DeviceView(A_DEVICE_ID).toRustAction()) .isEqualTo(RustAccountManagementAction.DeviceView(A_DEVICE_ID.value)) - assertThat(AccountManagementAction.SessionsList.toRustAction()) + assertThat(AccountManagementAction.DevicesList.toRustAction()) .isEqualTo(RustAccountManagementAction.DevicesList) } }