Merge branch 'crypto-improvements' into new-state-store

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;
                 }

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
                     );