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

Merge branch 'develop' into valere/rtc/voice_call

Browse source
This commit is contained in:
Valere 2026-03-06 12:22:28 +01:00
commit 14cea294bb
9 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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 {
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
}

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 {
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
}
}

6
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`() {
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)
}
}

3
libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
View file

@ -103,6 +103,9 @@ fun MarkdownTextInput(
}
addTextChangedListener { editable ->
onTyping(!editable.isNullOrEmpty())
if (state.lineCount != lineCount) {
post { bringPointIntoView(selectionStart) }
}
state.text.update(editable, false)
state.lineCount = lineCount