mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-10-31 16:22:49 +00:00
Rename our classes too.
This commit is contained in:
@@ -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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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)),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -98,7 +98,7 @@ 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("SessionsList url")
|
||||||
|
|||||||
+3
-3
@@ -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
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -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.DeviceDelete(deviceId.value)
|
is AccountManagementAction.DeviceDelete -> RustAccountManagementAction.DeviceDelete(deviceId.value)
|
||||||
is AccountManagementAction.SessionView -> RustAccountManagementAction.DeviceView(deviceId.value)
|
is AccountManagementAction.DeviceView -> RustAccountManagementAction.DeviceView(deviceId.value)
|
||||||
AccountManagementAction.SessionsList -> RustAccountManagementAction.DevicesList
|
AccountManagementAction.DevicesList -> RustAccountManagementAction.DevicesList
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -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.DeviceDelete(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.DeviceView(A_DEVICE_ID.value))
|
.isEqualTo(RustAccountManagementAction.DeviceView(A_DEVICE_ID.value))
|
||||||
assertThat(AccountManagementAction.SessionsList.toRustAction())
|
assertThat(AccountManagementAction.DevicesList.toRustAction())
|
||||||
.isEqualTo(RustAccountManagementAction.DevicesList)
|
.isEqualTo(RustAccountManagementAction.DevicesList)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user