From 057c21f7d0a9ba3b3fd4514e1c87075c5630eca8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 22 Jun 2020 09:17:37 +0200 Subject: [PATCH] Incomplete predicate in RealmCryptoStore#getOutgoingRoomKeyRequest (#1519) --- CHANGES.md | 1 + .../android/internal/crypto/store/db/RealmCryptoStore.kt | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5a5b919087..bfea6c4742 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,7 @@ Improvements 🙌: Bugfix 🐛: - Fix dark theme issue on login screen (#1097) + - Incomplete predicate in RealmCryptoStore#getOutgoingRoomKeyRequest (#1519) Translations 🗣: - diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt index 6af96f886d..a78ab70b72 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt @@ -897,9 +897,9 @@ internal class RealmCryptoStore @Inject constructor( it.toOutgoingGossipingRequest() as? OutgoingRoomKeyRequest }.firstOrNull { it.requestBody?.algorithm == requestBody.algorithm - it.requestBody?.roomId == requestBody.roomId - it.requestBody?.senderKey == requestBody.senderKey - it.requestBody?.sessionId == requestBody.sessionId + && it.requestBody?.roomId == requestBody.roomId + && it.requestBody?.senderKey == requestBody.senderKey + && it.requestBody?.sessionId == requestBody.sessionId } } @@ -1266,7 +1266,7 @@ internal class RealmCryptoStore @Inject constructor( deviceInfoEntity.trustLevelEntity = it } } else { - locallyVerified?.let { trustEntity.locallyVerified = it } + locallyVerified?.let { trustEntity.locallyVerified = it } trustEntity.crossSignedVerified = crossSignedVerified } }