From e554f8446ed34e314499f138d632c678e2804387 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 25 Oct 2024 10:01:27 +0200 Subject: [PATCH] Comment out code for incoming verification request, to make the app build with the current SDK version. --- .../verification/RustSessionVerificationService.kt | 13 ++++++++++++- .../SessionVerificationRequestDetails.kt | 4 +++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt index c9518499bd..9caf06c9c5 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt @@ -45,7 +45,9 @@ import org.matrix.rustcomponents.sdk.use import timber.log.Timber import kotlin.time.Duration.Companion.seconds import org.matrix.rustcomponents.sdk.SessionVerificationData as RustSessionVerificationData -import org.matrix.rustcomponents.sdk.SessionVerificationRequestDetails as RustSessionVerificationRequestDetails + +// INCOMING_VERIFICATION_PATCH +// import org.matrix.rustcomponents.sdk.SessionVerificationRequestDetails as RustSessionVerificationRequestDetails class RustSessionVerificationService( private val client: Client, @@ -105,9 +107,12 @@ class RustSessionVerificationService( .launchIn(sessionCoroutineScope) } + /* + // INCOMING_VERIFICATION_PATCH override fun didReceiveVerificationRequest(details: RustSessionVerificationRequestDetails) { listener?.onIncomingSessionRequest(details.map()) } + */ private var listener: SessionVerificationServiceListener? = null @@ -135,14 +140,20 @@ class RustSessionVerificationService( } override suspend fun acknowledgeVerificationRequest(details: SessionVerificationRequestDetails) = tryOrFail { + /* + // INCOMING_VERIFICATION_PATCH verificationController.acknowledgeVerificationRequest( senderId = details.senderId.value, flowId = details.flowId.value, ) + */ } override suspend fun acceptVerificationRequest() = tryOrFail { + /* + // INCOMING_VERIFICATION_PATCH verificationController.acceptVerificationRequest() + */ } private suspend fun tryOrFail(block: suspend () -> Unit) { diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/SessionVerificationRequestDetails.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/SessionVerificationRequestDetails.kt index e12cfbeb3f..63155a56ef 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/SessionVerificationRequestDetails.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/SessionVerificationRequestDetails.kt @@ -7,6 +7,8 @@ package io.element.android.libraries.matrix.impl.verification +/* +// INCOMING_VERIFICATION_PATCH import io.element.android.libraries.matrix.api.core.DeviceId import io.element.android.libraries.matrix.api.core.FlowId import io.element.android.libraries.matrix.api.core.UserId @@ -20,4 +22,4 @@ fun RustSessionVerificationRequestDetails.map() = SessionVerificationRequestDeta displayName = displayName, firstSeenTimestamp = firstSeenTimestamp.toLong(), ) - + */