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

Use .value instead of .toString().

Browse source
This commit is contained in:
Benoit Marty 2025-09-11 17:04:58 +02:00
parent 1fe2eceb9a
commit d06c9de08c
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt
View file

@ -242,7 +242,7 @@ private fun RoomMemberActionsBottomSheet(
) )
} }
Text( Text(
text = user.userId.toString(), text = user.userId.value,
style = ElementTheme.typography.fontBodyLgRegular, style = ElementTheme.typography.fontBodyLgRegular,
color = ElementTheme.colors.textSecondary, color = ElementTheme.colors.textSecondary,
maxLines = 1, maxLines = 1,

2
libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultBaseRoomLastMessageFormatterTest.kt
View file

@ -102,7 +102,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
val info = ImageInfo(null, null, null, null, null, null, null) val info = ImageInfo(null, null, null, null, null, null, null)
val message = createRoomEvent(false, null, aStickerContent(body, info, aMediaSource(url = "url"))) val message = createRoomEvent(false, null, aStickerContent(body, info, aMediaSource(url = "url")))
val result = formatter.format(message, false) val result = formatter.format(message, false)
val expectedBody = someoneElseId.toString() + ": Sticker (a sticker body)" val expectedBody = someoneElseId.value + ": Sticker (a sticker body)"
assertThat(result.toString()).isEqualTo(expectedBody) assertThat(result.toString()).isEqualTo(expectedBody)
} }

2
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatterns.kt
View file

@ -151,7 +151,7 @@ object MatrixPatterns {
val urlMatch = match.groupValues[1] val urlMatch = match.groupValues[1]
when (val permalink = permalinkParser.parse(urlMatch)) { when (val permalink = permalinkParser.parse(urlMatch)) {
is PermalinkData.UserLink -> { is PermalinkData.UserLink -> {
add(MatrixPatternResult(MatrixPatternType.USER_ID, permalink.userId.toString(), match.range.first, match.range.last + 1)) add(MatrixPatternResult(MatrixPatternType.USER_ID, permalink.userId.value, match.range.first, match.range.last + 1))
} }
is PermalinkData.RoomLink -> { is PermalinkData.RoomLink -> {
when (permalink.roomIdOrAlias) { when (permalink.roomIdOrAlias) {

4
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt
View file

@ -305,13 +305,13 @@ class RustBaseRoom(
override suspend fun declineCall(notificationEventId: EventId): Result<Unit> = withContext(roomDispatcher) { override suspend fun declineCall(notificationEventId: EventId): Result<Unit> = withContext(roomDispatcher) {
runCatchingExceptions { runCatchingExceptions {
innerRoom.declineCall(notificationEventId.toString()) innerRoom.declineCall(notificationEventId.value)
} }
} }
override suspend fun subscribeToCallDecline(notificationEventId: EventId): Flow<UserId> = withContext(roomDispatcher) { override suspend fun subscribeToCallDecline(notificationEventId: EventId): Flow<UserId> = withContext(roomDispatcher) {
mxCallbackFlow { mxCallbackFlow {
innerRoom.subscribeToCallDeclineEvents(notificationEventId.toString(), object : CallDeclineListener { innerRoom.subscribeToCallDeclineEvents(notificationEventId.value, object : CallDeclineListener {
override fun call(declinerUserId: String) { override fun call(declinerUserId: String) {
trySend(UserId(declinerUserId)) trySend(UserId(declinerUserId))
} }

2
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/AllowRule.kt
View file

@ -20,7 +20,7 @@ fun RustAllowRule.map(): AllowRule {
fun AllowRule.map(): RustAllowRule { fun AllowRule.map(): RustAllowRule {
return when (this) { return when (this) {
is AllowRule.RoomMembership -> RustAllowRule.RoomMembership(roomId.toString()) is AllowRule.RoomMembership -> RustAllowRule.RoomMembership(roomId.value)
is AllowRule.Custom -> RustAllowRule.Custom(json) is AllowRule.Custom -> RustAllowRule.Custom(json)
} }
} }