From 67f238069abaf6a2f7660685555fd5bd673e8d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Wed, 24 Mar 2021 15:44:33 +0100 Subject: [PATCH] crypto: Remove the gossipping managers from the crypto service --- .../internal/crypto/DefaultCryptoService.kt | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt index 53ab64e4eb..8112a6b70e 100755 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt @@ -153,10 +153,7 @@ internal class DefaultCryptoService @Inject constructor( private val verificationService: DefaultVerificationService, private val crossSigningService: DefaultCrossSigningService, - // - private val outgoingGossipingRequestManager: OutgoingGossipingRequestManager, // Actions - private val setDeviceVerificationAction: SetDeviceVerificationAction, private val megolmSessionDataImporter: MegolmSessionDataImporter, private val warnOnUnknownDevicesRepository: WarnOnUnknownDeviceRepository, // Repository @@ -527,7 +524,7 @@ internal class DefaultCryptoService @Inject constructor( * @param deviceId the unique identifier for the device. */ override fun setDeviceVerification(trustLevel: DeviceTrustLevel, userId: String, deviceId: String) { - setDeviceVerificationAction.handle(trustLevel, userId, deviceId) + // TODO } /** @@ -1102,7 +1099,7 @@ internal class DefaultCryptoService @Inject constructor( * @param requestBody requestBody */ override fun cancelRoomKeyRequest(requestBody: RoomKeyRequestBody) { - outgoingGossipingRequestManager.cancelRoomKeyRequest(requestBody) + // TODO } /** @@ -1111,18 +1108,7 @@ internal class DefaultCryptoService @Inject constructor( * @param event the event to decrypt again. */ override fun reRequestRoomKeyForEvent(event: Event) { - val wireContent = event.content.toModel() ?: return Unit.also { - Timber.e("## CRYPTO | reRequestRoomKeyForEvent Failed to re-request key, null content") - } - - val requestBody = RoomKeyRequestBody( - algorithm = wireContent.algorithm, - roomId = event.roomId, - senderKey = wireContent.senderKey, - sessionId = wireContent.sessionId - ) - - outgoingGossipingRequestManager.resendRoomKeyRequest(requestBody) + // TODO } /**