wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the action of a room key request cancellation.

Browse source 
The spec states that the action of a room key request cancellation
should be "cancel_request" but every known implementation uses
"request_cancellation" instead.

This patch fixes the spec to reflect the implementations.
This commit is contained in:
Damir Jelić 2019-08-26 12:11:11 +02:00
parent 0265817c56
commit a96a2f3fce
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
event-schemas/examples/m.room_key_request$cancel_request
View file

@ -1,6 +1,6 @@
{ {
"content": { "content": {
"action": "cancel_request", "action": "request_cancellation",
"requesting_device_id": "RJYKSTBOIE", "requesting_device_id": "RJYKSTBOIE",
"request_id": "1495474790150.19" "request_id": "1495474790150.19"
}, },

2
event-schemas/schema/m.room_key_request
View file

@ -38,7 +38,7 @@ properties:
action: action:
enum: enum:
- request - request
- cancel_request - request_cancellation
type: string type: string
requesting_device_id: requesting_device_id:
description: ID of the device requesting the key. description: ID of the device requesting the key.

4
specification/modules/end_to_end_encryption.rst
View file

@ -756,8 +756,8 @@ sending `m.room_key_request`_ to-device messages to other devices with
device, it can forward the keys to the first device by sending an encrypted device, it can forward the keys to the first device by sending an encrypted
`m.forwarded_room_key`_ to-device message. The first device should then send an `m.forwarded_room_key`_ to-device message. The first device should then send an
`m.room_key_request`_ to-device message with ``action`` set to `m.room_key_request`_ to-device message with ``action`` set to
``cancel_request`` to the other devices that it had originally sent the key ``request_cancellation`` to the other devices that it had originally sent the key
request to; a device that receives a ``cancel_request`` should disregard any request to; a device that receives a ``request_cancellation`` should disregard any
previously-received ``request`` message with the same ``request_id`` and previously-received ``request`` message with the same ``request_id`` and
``requesting_device_id``. ``requesting_device_id``.