From 98533f01d9f39d19d04841a079b6ebe9284559f8 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Tue, 31 Aug 2021 16:40:31 +0200
Subject: [PATCH] Fix session always being rotated if 'verified only' is active
---
src/Cache.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/Cache.cpp b/src/Cache.cpp
index ed6a5f34b..a7fe473fb 100644
--- a/src/Cache.cpp
+++ b/src/Cache.cpp
@@ -3759,7 +3759,8 @@ Cache::getMembersWithKeys(const std::string &room_id, bool verified_only)
if (res) {
auto k = json::parse(keys).get<UserKeyCache>();
if (verified_only) {
- auto verif = verificationStatus(std::string(user_id));
+ auto verif = verificationStatus_(std::string(user_id), txn);
+
if (verif.user_verified == crypto::Trust::Verified ||
!verif.verified_devices.empty()) {
auto keyCopy = k;
@@ -3807,7 +3808,8 @@ Cache::getMembersWithKeys(const std::string &room_id, bool verified_only)
cursor.close();
return members;
- } catch (std::exception &) {
+ } catch (std::exception &e) {
+ nhlog::db()->debug("Error retrieving members: {}", e.what());
return {};
}
}
--
GitLab