PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #5278 from matrix-org/t3chguy/fix/15362

Browse source 
Decorate failed e2ee downgrade attempts better
This commit is contained in:
Michael Telatynski 2020-10-02 18:19:05 +01:00 committed by GitHub
commit a6246a7e9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/views/messages/EncryptionEvent.js
View file

@ -25,10 +25,8 @@ export default class EncryptionEvent extends React.Component {
let body; let body;
let classes = "mx_EventTile_bubble mx_cryptoEvent mx_cryptoEvent_icon"; let classes = "mx_EventTile_bubble mx_cryptoEvent mx_cryptoEvent_icon";
if ( const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(mxEvent.getRoomId());
mxEvent.getContent().algorithm === 'm.megolm.v1.aes-sha2' && if (mxEvent.getContent().algorithm === 'm.megolm.v1.aes-sha2' && isRoomEncrypted) {
MatrixClientPeg.get().isRoomEncrypted(mxEvent.getRoomId())
) {
body = <div> body = <div>
<div className="mx_cryptoEvent_title">{_t("Encryption enabled")}</div> <div className="mx_cryptoEvent_title">{_t("Encryption enabled")}</div>
<div className="mx_cryptoEvent_subtitle"> <div className="mx_cryptoEvent_subtitle">
@ -38,6 +36,13 @@ export default class EncryptionEvent extends React.Component {
)} )}
</div> </div>
</div>; </div>;
} else if (isRoomEncrypted) {
body = <div>
<div className="mx_cryptoEvent_title">{_t("Encryption enabled")}</div>
<div className="mx_cryptoEvent_subtitle">
{_t("Ignored attempt to disable encryption")}
</div>
</div>;
} else { } else {
body = <div> body = <div>
<div className="mx_cryptoEvent_title">{_t("Encryption not enabled")}</div> <div className="mx_cryptoEvent_title">{_t("Encryption not enabled")}</div>

1
src/i18n/strings/en_EN.json
View file

@ -1376,6 +1376,7 @@
"View Source": "View Source", "View Source": "View Source",
"Encryption enabled": "Encryption enabled", "Encryption enabled": "Encryption enabled",
"Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.", "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.",
"Ignored attempt to disable encryption": "Ignored attempt to disable encryption",
"Encryption not enabled": "Encryption not enabled", "Encryption not enabled": "Encryption not enabled",
"The encryption used by this room isn't supported.": "The encryption used by this room isn't supported.", "The encryption used by this room isn't supported.": "The encryption used by this room isn't supported.",
"Error decrypting audio": "Error decrypting audio", "Error decrypting audio": "Error decrypting audio",