From fab0350ca11f922c02c9cbcf20259ccf04194e12 Mon Sep 17 00:00:00 2001
From: valere <valeref@matrix.org>
Date: Tue, 3 Jan 2023 09:53:22 +0100
Subject: [PATCH] rust key safety integration

---
 library/rustCrypto/matrix-rust-sdk-crypto.aar                 | 4 ++--
 .../java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/rustCrypto/matrix-rust-sdk-crypto.aar b/library/rustCrypto/matrix-rust-sdk-crypto.aar
index 3f82688223..a645eb775f 100644
--- a/library/rustCrypto/matrix-rust-sdk-crypto.aar
+++ b/library/rustCrypto/matrix-rust-sdk-crypto.aar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2757d2d9d582be0747fbdaca8426ade4c333f4dfee288dadd0a3b48dff463527
-size 17289398
+oid sha256:3f303e8830bb4bd7005b2a166118d7771ed07259822ebb6f888abb0ed459f0cc
+size 50458247
diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt
index 2e02a5aba2..fc33a44ac9 100644
--- a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt
+++ b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt
@@ -73,13 +73,13 @@ import org.matrix.rustcomponents.sdk.crypto.DecryptionException
 import org.matrix.rustcomponents.sdk.crypto.DeviceLists
 import org.matrix.rustcomponents.sdk.crypto.EncryptionSettings
 import org.matrix.rustcomponents.sdk.crypto.KeyRequestPair
+import org.matrix.rustcomponents.sdk.crypto.KeySafety
 import org.matrix.rustcomponents.sdk.crypto.KeysImportResult
 import org.matrix.rustcomponents.sdk.crypto.Logger
 import org.matrix.rustcomponents.sdk.crypto.MegolmV1BackupKey
 import org.matrix.rustcomponents.sdk.crypto.Request
 import org.matrix.rustcomponents.sdk.crypto.RequestType
 import org.matrix.rustcomponents.sdk.crypto.RoomKeyCounts
-import org.matrix.rustcomponents.sdk.crypto.VerificationState
 import org.matrix.rustcomponents.sdk.crypto.setLogger
 import timber.log.Timber
 import java.io.File
@@ -439,7 +439,7 @@ internal class OlmMachine @Inject constructor(
                             senderCurve25519Key = decrypted.senderCurve25519Key,
                             claimedEd25519Key = decrypted.claimedEd25519Key,
                             forwardingCurve25519KeyChain = decrypted.forwardingCurve25519Chain,
-                            isSafe = decrypted.verificationState == VerificationState.TRUSTED,
+                            isSafe = decrypted.keySafety == KeySafety.SAFE,
                     )
                 } catch (throwable: Throwable) {
                     val reThrow = when (throwable) {