Merge branch 'master' into soru/cross-signing
This commit is contained in:
commit
fc5400a30c
|
@ -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) {
|
||||||
|
|
Loading…
Reference in a new issue