Skip to content

Commit

Permalink
Remove extraneous mimetype from EncryptedFile examples, per MSC2582 (#…
Browse files Browse the repository at this point in the history
…3412)

* Remove extraneous mimetype from EncryptedFile examples, per MSC2582

MSC: #2582

* changelog
  • Loading branch information
turt2live committed Sep 27, 2021
1 parent 7e67aa2 commit b7e6104
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions 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).
6 changes: 2 additions & 4 deletions content/client-server-api/modules/end_to_end_encryption.md
Expand Up @@ -282,7 +282,6 @@ Example:
"body": "something-important.jpg",
"file": {
"url": "mxc://example.org/FHyPlCeYUSFFxlgbQYZmoEoe",
"mimetype": "image/jpeg",
"v": "v2",
"key": {
"alg": "A256CTR",
Expand Down Expand Up @@ -312,7 +311,6 @@ Example:
"key_ops": ["encrypt", "decrypt"],
"kty": "oct"
},
"mimetype": "image/jpeg",
"url": "mxc://example.org/pmVJxyxGlmxHposwVSlOaEOv",
"v": "v2"
},
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b7e6104

Please sign in to comment.