From a5131a0a73a7441e8af8656ff56b68edb237b049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Fri, 4 Dec 2020 16:58:20 +0100 Subject: [PATCH 1/2] crypto: Log both user id versions when the device keys mismatch. --- matrix_sdk_crypto/src/identities/manager.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/matrix_sdk_crypto/src/identities/manager.rs b/matrix_sdk_crypto/src/identities/manager.rs index 02a440a0..48d5faf1 100644 --- a/matrix_sdk_crypto/src/identities/manager.rs +++ b/matrix_sdk_crypto/src/identities/manager.rs @@ -136,8 +136,8 @@ impl IdentityManager { if user_id != &device_keys.user_id || device_id != &device_keys.device_id { warn!( - "Mismatch in device keys payload of device {} from user {}", - device_keys.device_id, device_keys.user_id + "Mismatch in device keys payload of device {}|{} from user {}|{}", + device_id, device_keys.device_id, user_id, device_keys.user_id ); continue; } From f483a56f8135053dd2ebff967275cf84530abe6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Fri, 4 Dec 2020 17:01:15 +0100 Subject: [PATCH 2/2] crypto: Remove a bunch of unneeded whitespace in a log line. --- matrix_sdk_crypto/src/olm/account.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix_sdk_crypto/src/olm/account.rs b/matrix_sdk_crypto/src/olm/account.rs index 0557129a..cf20c691 100644 --- a/matrix_sdk_crypto/src/olm/account.rs +++ b/matrix_sdk_crypto/src/olm/account.rs @@ -307,7 +307,7 @@ impl Account { // return with an error if it isn't one. OlmMessage::Message(_) => { warn!( - "Failed to decrypt a non-pre-key message with all + "Failed to decrypt a non-pre-key message with all \ available sessions {} {}", sender, sender_key );