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

SessionVerificationRequestDetails: map deviceDisplayName.

Browse source
This commit is contained in:
Benoit Marty 2025-09-29 15:24:39 +02:00 • committed by Benoit Marty
parent c8090b136b
commit fd2041a7ef
4 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationStateProvider.kt
View file

@ -62,6 +62,7 @@ internal fun anIncomingSessionVerificationRequest() = VerificationRequest.Incomi
), ),
flowId = FlowId("1234"), flowId = FlowId("1234"),
deviceId = DeviceId("ILAKNDNASDLK"), deviceId = DeviceId("ILAKNDNASDLK"),
deviceDisplayName = "a device name",
firstSeenTimestamp = 0, firstSeenTimestamp = 0,
) )
) )
@ -75,6 +76,7 @@ internal fun anIncomingUserVerificationRequest() = VerificationRequest.Incoming.
), ),
flowId = FlowId("1234"), flowId = FlowId("1234"),
deviceId = DeviceId("ILAKNDNASDLK"), deviceId = DeviceId("ILAKNDNASDLK"),
deviceDisplayName = "a device name",
firstSeenTimestamp = 0, firstSeenTimestamp = 0,
) )
) )

3
features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenterTest.kt
View file

@ -295,11 +295,12 @@ private val anIncomingSessionVerificationRequest = VerificationRequest.Incoming.
details = SessionVerificationRequestDetails( details = SessionVerificationRequestDetails(
senderProfile = SessionVerificationRequestDetails.SenderProfile( senderProfile = SessionVerificationRequestDetails.SenderProfile(
userId = A_USER_ID, userId = A_USER_ID,
displayName = "a device name", displayName = "a user name",
avatarUrl = null, avatarUrl = null,
), ),
flowId = FlowId("flowId"), flowId = FlowId("flowId"),
deviceId = A_DEVICE_ID, deviceId = A_DEVICE_ID,
deviceDisplayName = "a device name",
firstSeenTimestamp = A_TIMESTAMP, firstSeenTimestamp = A_TIMESTAMP,
) )
) )

1
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationRequestDetails.kt
View file

@ -18,6 +18,7 @@ data class SessionVerificationRequestDetails(
val senderProfile: SenderProfile, val senderProfile: SenderProfile,
val flowId: FlowId, val flowId: FlowId,
val deviceId: DeviceId, val deviceId: DeviceId,
val deviceDisplayName: String?,
val firstSeenTimestamp: Long, val firstSeenTimestamp: Long,
) : Parcelable { ) : Parcelable {
@Parcelize @Parcelize

1
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/SessionVerificationRequestDetails.kt
View file

@ -19,6 +19,7 @@ fun RustSessionVerificationRequestDetails.map() = SessionVerificationRequestDeta
senderProfile = senderProfile.map(), senderProfile = senderProfile.map(),
flowId = FlowId(flowId), flowId = FlowId(flowId),
deviceId = DeviceId(deviceId), deviceId = DeviceId(deviceId),
deviceDisplayName = deviceDisplayName,
firstSeenTimestamp = firstSeenTimestamp.toLong(), firstSeenTimestamp = firstSeenTimestamp.toLong(),
) )