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

Merge pull request #6726 from element-hq/feature/bma/renameVerificationMethod

Browse source 
Rename verification methods
This commit is contained in:
Benoit Marty 2026-05-06 17:50:11 +02:00 • committed by GitHub
commit 15162e4e32
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 58 additions and 49 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/verification/SessionVerificationService.kt
View file

@ -33,7 +33,7 @@ interface SessionVerificationService {
/**
* Request verification of the current session.
*/
suspend fun requestCurrentSessionVerification()
suspend fun requestDeviceVerification()
/**
* Request verification of the user with the given [userId].
@ -56,9 +56,9 @@ interface SessionVerificationService {
suspend fun declineVerification()
/**
* Starts the verification of the unverified session from another device.
* Transition the current verification request into a SAS verification flow.
*/
suspend fun startVerification()
suspend fun startSasVerification()
/**
* Returns the verification service state to the initial step.

4
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt
View file

@ -124,7 +124,7 @@ class RustSessionVerificationService(
this.listener = listener
}
override suspend fun requestCurrentSessionVerification() = tryOrFail {
override suspend fun requestDeviceVerification() = tryOrFail {
ensureEncryptionIsInitialized()
verificationController.requestDeviceVerification()
currentVerificationRequest = VerificationRequest.Outgoing.CurrentSession
@ -146,7 +146,7 @@ class RustSessionVerificationService(
override suspend fun declineVerification() = tryOrFail { verificationController.declineVerification() }
override suspend fun startVerification() = tryOrFail {
override suspend fun startSasVerification() = tryOrFail {
verificationController.startSasVerification()
}

24
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/verification/FakeSessionVerificationService.kt
View file

@ -22,12 +22,12 @@ import kotlinx.coroutines.flow.StateFlow
class FakeSessionVerificationService(
initialSessionVerifiedStatus: SessionVerifiedStatus = SessionVerifiedStatus.Unknown,
private val requestCurrentSessionVerificationLambda: () -> Unit = { lambdaError() },
private val requestDeviceVerificationLambda: () -> Unit = { lambdaError() },
private val requestUserVerificationLambda: (UserId) -> Unit = { lambdaError() },
private val cancelVerificationLambda: () -> Unit = { lambdaError() },
private val approveVerificationLambda: () -> Unit = { lambdaError() },
private val declineVerificationLambda: () -> Unit = { lambdaError() },
private val startVerificationLambda: () -> Unit = { lambdaError() },
private val startSasVerificationLambda: () -> Unit = { lambdaError() },
private val resetLambda: (Boolean) -> Unit = { lambdaError() },
private val acknowledgeVerificationRequestLambda: (VerificationRequest.Incoming) -> Unit = { lambdaError() },
private val acceptVerificationRequestLambda: () -> Unit = { lambdaError() },
@ -40,31 +40,31 @@ class FakeSessionVerificationService(
override val sessionVerifiedStatus: StateFlow<SessionVerifiedStatus> = _sessionVerifiedStatus
override val needsSessionVerification: Flow<Boolean> = _needsSessionVerification
override suspend fun requestCurrentSessionVerification() {
requestCurrentSessionVerificationLambda()
override suspend fun requestDeviceVerification() = simulateLongTask {
requestDeviceVerificationLambda()
}
override suspend fun requestUserVerification(userId: UserId) {
override suspend fun requestUserVerification(userId: UserId) = simulateLongTask {
requestUserVerificationLambda(userId)
}
override suspend fun cancelVerification() {
override suspend fun cancelVerification() = simulateLongTask {
cancelVerificationLambda()
}
override suspend fun approveVerification() {
override suspend fun approveVerification() = simulateLongTask {
approveVerificationLambda()
}
override suspend fun declineVerification() {
override suspend fun declineVerification() = simulateLongTask {
declineVerificationLambda()
}
override suspend fun startVerification() {
startVerificationLambda()
override suspend fun startSasVerification() = simulateLongTask {
startSasVerificationLambda()
}
override suspend fun reset(cancelAnyPendingVerificationAttempt: Boolean) {
override suspend fun reset(cancelAnyPendingVerificationAttempt: Boolean) = simulateLongTask {
resetLambda(cancelAnyPendingVerificationAttempt)
}
@ -75,7 +75,7 @@ class FakeSessionVerificationService(
this.listener = listener
}
override suspend fun acknowledgeVerificationRequest(verificationRequest: VerificationRequest.Incoming) {
override suspend fun acknowledgeVerificationRequest(verificationRequest: VerificationRequest.Incoming) = simulateLongTask {
acknowledgeVerificationRequestLambda(verificationRequest)
}