Merge pull request #2247 from matrix-org/poljar/key_request_fix

Fix the action of a room key request cancellation.

changelogs/client_server/newsfragments/2247.clarification

@@ -0,0 +1 @@
+Fix the ``m.room_key_request`` ``action`` value, setting it from ``cancel_request`` to ``request_cancellation``.

event-schemas/examples/m.room_key_request$cancel_request

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

event-schemas/schema/m.room_key_request

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

specification/modules/end_to_end_encryption.rst

@@ -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
 `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
-``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
 ``requesting_device_id``.