Merge branch 'master' into soru/cross-signing

This commit is contained in:
Sorunome 2020-06-12 14:34:22 +02:00
commit fc5400a30c
No known key found for this signature in database
GPG key ID: B19471D07FC9BE9C

View file

@ -660,7 +660,8 @@ class RoomKeyRequest extends ToDeviceEvent {
message['forwarding_curve25519_key_chain'] = forwardedKeys; message['forwarding_curve25519_key_chain'] = forwardedKeys;
message['sender_key'] = request.senderKey; message['sender_key'] = request.senderKey;
message['sender_claimed_ed25519_key'] = forwardedKeys.isEmpty ? keyManager.encryption.fingerprintKey : null; message['sender_claimed_ed25519_key'] =
forwardedKeys.isEmpty ? keyManager.encryption.fingerprintKey : null;
if (message['sender_claimed_ed25519_key'] == null) { if (message['sender_claimed_ed25519_key'] == null) {
for (final value in keyManager.client.userDeviceKeys.values) { for (final value in keyManager.client.userDeviceKeys.values) {
for (final key in value.deviceKeys.values) { for (final key in value.deviceKeys.values) {