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

Rename methods around verification, to match SDK naming.

Browse source
This commit is contained in:
Benoit Marty 2026-05-05 12:17:51 +02:00
parent c40f916b4f
commit 51bcaca9db
5 changed files with 39 additions and 39 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()
}

12
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,8 +40,8 @@ class FakeSessionVerificationService(
override val sessionVerifiedStatus: StateFlow<SessionVerifiedStatus> = _sessionVerifiedStatus
override val needsSessionVerification: Flow<Boolean> = _needsSessionVerification
override suspend fun requestCurrentSessionVerification() {
requestCurrentSessionVerificationLambda()
override suspend fun requestDeviceVerification() {
requestDeviceVerificationLambda()
}
override suspend fun requestUserVerification(userId: UserId) {
@ -60,8 +60,8 @@ class FakeSessionVerificationService(
declineVerificationLambda()
}
override suspend fun startVerification() {
startVerificationLambda()
override suspend fun startSasVerification() {
startSasVerificationLambda()
}
override suspend fun reset(cancelAnyPendingVerificationAttempt: Boolean) {