From 8c773b6d0033bfc543a56df13491fec7eaad7a91 Mon Sep 17 00:00:00 2001 From: valere Date: Mon, 12 Dec 2022 15:07:46 +0100 Subject: [PATCH] update crypto crate --- library/rustCrypto/matrix-rust-sdk-crypto.aar | 4 ++-- .../internal/crypto/verification/KotlinSasTransaction.kt | 6 +++--- .../crypto/verification/SasVerificationTransaction.kt | 2 +- .../sdk/internal/crypto/verification/SasVerification.kt | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/library/rustCrypto/matrix-rust-sdk-crypto.aar b/library/rustCrypto/matrix-rust-sdk-crypto.aar index a671b536c4..3f82688223 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:58160aa0e8a7f8a385d5a1fe146151f1d8e52abd7b2524f7c0097811ff413f00 -size 17332496 +oid sha256:2757d2d9d582be0747fbdaca8426ade4c333f4dfee288dadd0a3b48dff463527 +size 17289398 diff --git a/matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/verification/KotlinSasTransaction.kt b/matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/verification/KotlinSasTransaction.kt index 50fd3c8c29..4bbe2f3e40 100644 --- a/matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/verification/KotlinSasTransaction.kt +++ b/matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/verification/KotlinSasTransaction.kt @@ -207,9 +207,9 @@ internal class KotlinSasTransaction( override fun state() = this.state - override fun supportsEmoji(): Boolean { - return accepted?.shortAuthenticationStrings?.contains(SasMode.EMOJI) == true - } +// override fun supportsEmoji(): Boolean { +// return accepted?.shortAuthenticationStrings?.contains(SasMode.EMOJI) == true +// } override fun getEmojiCodeRepresentation(): List { return shortCodeBytes?.getEmojiCodeRepresentation().orEmpty() diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasVerificationTransaction.kt index 0b48786a09..99c3642b5e 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasVerificationTransaction.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasVerificationTransaction.kt @@ -44,7 +44,7 @@ interface SasVerificationTransaction : VerificationTransaction { override fun isSuccessful() = state() is SasTransactionState.Done - fun supportsEmoji(): Boolean +// fun supportsEmoji(): Boolean fun getEmojiCodeRepresentation(): List diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/verification/SasVerification.kt b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/verification/SasVerification.kt index eca9c19ef1..2a20bc090c 100644 --- a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/verification/SasVerification.kt +++ b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/verification/SasVerification.kt @@ -151,10 +151,10 @@ internal class SasVerification @AssistedInject constructor( /** Is this verification happening over to-device messages */ override fun isToDeviceTransport(): Boolean = inner.roomId() == null - /** Does the verification flow support showing emojis as the short auth string */ - override fun supportsEmoji(): Boolean { - return inner.supportsEmoji() - } +// /** Does the verification flow support showing emojis as the short auth string */ +// override fun supportsEmoji(): Boolean { +// return inner.supportsEmoji() +// } /** Confirm that the short authentication code matches on both sides *