Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Show a gray shield when encrypted by deleted session #6119

Merged
merged 4 commits into from
Nov 1, 2021
Merged

Show a gray shield when encrypted by deleted session #6119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa7973a
Show a gray shield when enc by deleted session
SimonBrandner May 29, 2021
9dbf576
Change icon to normal
SimonBrandner May 29, 2021
5987c97
Merge styles
SimonBrandner Jun 10, 2021
92b2780
Merge remote-tracking branch 'upstream/develop' into fix/deleted-sess…
SimonBrandner Jun 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions res/css/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,31 +345,15 @@ $left-gutter: 64px;
}
}

.mx_EventTile_e2eIcon_undecryptable, .mx_EventTile_e2eIcon_unverified {
.mx_EventTile_e2eIcon_warning {
&::after {
mask-image: url('$(res)/img/e2e/warning.svg');
background-color: $notice-primary-color;
}
opacity: 1;
}

.mx_EventTile_e2eIcon_unknown {
&::after {
mask-image: url('$(res)/img/e2e/warning.svg');
background-color: $notice-primary-color;
}
opacity: 1;
}

.mx_EventTile_e2eIcon_unencrypted {
&::after {
mask-image: url('$(res)/img/e2e/warning.svg');
background-color: $notice-primary-color;
}
opacity: 1;
}

.mx_EventTile_e2eIcon_unauthenticated {
.mx_EventTile_e2eIcon_normal {
&::after {
mask-image: url('$(res)/img/e2e/normal.svg');
background-color: $composer-e2e-icon-color;
Expand Down
8 changes: 4 additions & 4 deletions src/components/views/rooms/EventTile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,25 +1227,25 @@ export function haveTileForEvent(e) {

function E2ePadlockUndecryptable(props) {
return (
<E2ePadlock title={_t("This message cannot be decrypted")} icon="undecryptable" {...props} />
<E2ePadlock title={_t("This message cannot be decrypted")} icon="warning" {...props} />
);
}

function E2ePadlockUnverified(props) {
return (
<E2ePadlock title={_t("Encrypted by an unverified session")} icon="unverified" {...props} />
<E2ePadlock title={_t("Encrypted by an unverified session")} icon="warning" {...props} />
);
}

function E2ePadlockUnencrypted(props) {
return (
<E2ePadlock title={_t("Unencrypted")} icon="unencrypted" {...props} />
<E2ePadlock title={_t("Unencrypted")} icon="warning" {...props} />
);
}

function E2ePadlockUnknown(props) {
return (
<E2ePadlock title={_t("Encrypted by a deleted session")} icon="unknown" {...props} />
<E2ePadlock title={_t("Encrypted by a deleted session")} icon="normal" {...props} />
);
}

Expand Down