From b7e6104713bb5ed428273147330c6276028bc82a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 27 Sep 2021 10:05:15 -0600 Subject: [PATCH] Remove extraneous mimetype from EncryptedFile examples, per MSC2582 (#3412) * Remove extraneous mimetype from EncryptedFile examples, per MSC2582 MSC: https://github.com/matrix-org/matrix-doc/pull/2582 * changelog --- changelogs/client_server/newsfragments/3412.clarification | 1 + content/client-server-api/modules/end_to_end_encryption.md | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 changelogs/client_server/newsfragments/3412.clarification diff --git a/changelogs/client_server/newsfragments/3412.clarification b/changelogs/client_server/newsfragments/3412.clarification new file mode 100644 index 00000000..0a63bc3e --- /dev/null +++ b/changelogs/client_server/newsfragments/3412.clarification @@ -0,0 +1 @@ +Remove extraneous `mimetype` from `EncryptedFile` examples, as per [MSC2582](https://github.com/matrix-org/matrix-doc/pull/2582). \ No newline at end of file diff --git a/content/client-server-api/modules/end_to_end_encryption.md b/content/client-server-api/modules/end_to_end_encryption.md index cbd4f161..9a109163 100644 --- a/content/client-server-api/modules/end_to_end_encryption.md +++ b/content/client-server-api/modules/end_to_end_encryption.md @@ -282,7 +282,6 @@ Example: "body": "something-important.jpg", "file": { "url": "mxc://example.org/FHyPlCeYUSFFxlgbQYZmoEoe", - "mimetype": "image/jpeg", "v": "v2", "key": { "alg": "A256CTR", @@ -312,7 +311,6 @@ Example: "key_ops": ["encrypt", "decrypt"], "kty": "oct" }, - "mimetype": "image/jpeg", "url": "mxc://example.org/pmVJxyxGlmxHposwVSlOaEOv", "v": "v2" }, @@ -1019,8 +1017,8 @@ The process between Alice and Bob verifying each other would be: is able to scan. Bob's client prompts displays a QR code that Alice can scan if Alice's client indicated the ability to scan, and an option to scan Alice's QR code if his client is able to scan. The format for the QR code - is described below. Other options, like starting SAS Emoji verification, - can be presented alongside the QR code if the devices have appropriate + is described below. Other options, like starting SAS Emoji verification, + can be presented alongside the QR code if the devices have appropriate support. 5. Alice scans Bob's QR code. 6. Alice's device ensures that the keys encoded in the QR code match the