From 54e8debc38063af846deb0424dec26886b3bb34f Mon Sep 17 00:00:00 2001
From: valere <valeref@matrix.org>
Date: Tue, 3 Jan 2023 09:52:58 +0100
Subject: [PATCH] cleaning and logs

---
 .../matrix/android/sdk/internal/crypto/EventDecryptor.kt    | 6 ++++++
 .../matrix/android/sdk/internal/crypto/RustCryptoService.kt | 3 +++
 .../crypto/verification/self/SelfVerificationController.kt  | 4 +---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
index 4bafb46e1b..fe57cf553b 100644
--- a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
+++ b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
@@ -24,7 +24,13 @@ import javax.inject.Inject
 internal class EventDecryptor @Inject constructor(val decryptRoomEventUseCase: DecryptRoomEventUseCase) {
 
     @Throws(MXCryptoError::class)
+    @Suppress("UNUSED_PARAMETER")
     suspend fun decryptEvent(event: Event, timeline: String): MXEventDecryptionResult {
         return decryptRoomEventUseCase.invoke(event)
     }
+
+    @Suppress("UNUSED_PARAMETER")
+    suspend fun decryptEventAndSaveResult(event: Event, timeline: String) {
+        return decryptRoomEventUseCase.decryptAndSaveResult(event)
+    }
 }
diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt
index 9e87251b94..8d99cdad48 100755
--- a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt
+++ b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt
@@ -80,6 +80,7 @@ import org.matrix.android.sdk.internal.crypto.tasks.DeleteDeviceTask
 import org.matrix.android.sdk.internal.crypto.tasks.GetDeviceInfoTask
 import org.matrix.android.sdk.internal.crypto.tasks.GetDevicesTask
 import org.matrix.android.sdk.internal.crypto.tasks.SetDeviceNameTask
+import org.matrix.android.sdk.internal.crypto.tasks.toDeviceTracingId
 import org.matrix.android.sdk.internal.crypto.verification.RustVerificationService
 import org.matrix.android.sdk.internal.di.DeviceId
 import org.matrix.android.sdk.internal.di.UserId
@@ -587,6 +588,8 @@ internal class RustCryptoService @Inject constructor(
 
         // Notify the our listeners about room keys so decryption is retried.
         toDeviceEvents.events.orEmpty().forEach { event ->
+            Timber.tag(loggerTag.value).d("Processed ToDevice event msgid:${event.toDeviceTracingId()}")
+
             if (event.getClearType() == EventType.ENCRYPTED) {
                 // rust failed to decrypt it
                 matrixConfiguration.cryptoAnalyticsPlugin?.onFailToDecryptToDevice(
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt
index 58d12ef9e6..cf67c8861e 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt
@@ -24,8 +24,8 @@ import im.vector.app.R
 import im.vector.app.core.epoxy.bottomSheetDividerItem
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.ItemStyle
+import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.features.crypto.verification.epoxy.bottomSheetSelfWaitItem
 import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
 import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
@@ -41,7 +41,6 @@ import im.vector.app.features.crypto.verification.user.renderSasTransaction
 import im.vector.app.features.crypto.verification.user.renderStartTransactionOptions
 import im.vector.app.features.crypto.verification.user.verifiedSuccessTile
 import im.vector.app.features.html.EventHtmlRenderer
-import im.vector.app.features.spaces.create.SpaceType
 import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence
 import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
 import org.matrix.android.sdk.api.session.crypto.verification.EVerificationState
@@ -127,7 +126,6 @@ class SelfVerificationController @Inject constructor(
                 val pendingRequest = state.pendingRequest.invoke()
                 when (pendingRequest.state) {
                     EVerificationState.WaitingForReady -> {
-
                         genericFooterItem {
                             id("open_other")
                             style(ItemStyle.NORMAL_TEXT)