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

Remove extraneous mimetype from EncryptedFile examples, per MSC2582 (#3412)

Browse source 
* Remove extraneous mimetype from EncryptedFile examples, per MSC2582

MSC: https://github.com/matrix-org/matrix-doc/pull/2582

* changelog
This commit is contained in:
Travis Ralston 2021-09-27 10:05:15 -06:00 • committed by GitHub
parent 7e67aa2e23
commit b7e6104713
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelogs/client_server/newsfragments/3412.clarification Normal file
View file

@ -0,0 +1 @@
Remove extraneous `mimetype` from `EncryptedFile` examples, as per [MSC2582](https://github.com/matrix-org/matrix-doc/pull/2582).

6
content/client-server-api/modules/end_to_end_encryption.md
View file

@ -282,7 +282,6 @@ Example:
"body": "something-important.jpg", "body": "something-important.jpg",
"file": { "file": {
"url": "mxc://example.org/FHyPlCeYUSFFxlgbQYZmoEoe", "url": "mxc://example.org/FHyPlCeYUSFFxlgbQYZmoEoe",
"mimetype": "image/jpeg",
"v": "v2", "v": "v2",
"key": { "key": {
"alg": "A256CTR", "alg": "A256CTR",
@ -312,7 +311,6 @@ Example:
"key_ops": ["encrypt", "decrypt"], "key_ops": ["encrypt", "decrypt"],
"kty": "oct" "kty": "oct"
}, },
"mimetype": "image/jpeg",
"url": "mxc://example.org/pmVJxyxGlmxHposwVSlOaEOv", "url": "mxc://example.org/pmVJxyxGlmxHposwVSlOaEOv",
"v": "v2" "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 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 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 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, is described below. Other options, like starting SAS Emoji verification,
can be presented alongside the QR code if the devices have appropriate can be presented alongside the QR code if the devices have appropriate
support. support.
5. Alice scans Bob's QR code. 5. Alice scans Bob's QR code.
6. Alice's device ensures that the keys encoded in the QR code match the 6. Alice's device ensures that the keys encoded in the QR code match the