OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4223 from matrix-org/jryans/key-backup-text-xsign 

Fix key backup trust text for cross-signing
pull/21833/head
J. Ryan Stinnett 2020-03-17 16:46:53 +00:00 committed by GitHub
parent b09c063d1b cc27894fc9
commit e51a7f3ca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/views/settings/KeyBackupPanel.js
View File

@ -277,25 +277,25 @@ export default class KeyBackupPanel extends React.PureComponent {
"Backup has an <validity>invalid</validity> signature from this session", "Backup has an <validity>invalid</validity> signature from this session",
{}, { validity }, {}, { validity },
); );
} else if (sig.valid && sig.device.isVerified()) { } else if (sig.valid && sig.deviceTrust.isVerified()) {
sigStatus = _t( sigStatus = _t(
"Backup has a <validity>valid</validity> signature from " + "Backup has a <validity>valid</validity> signature from " +
"<verify>verified</verify> session <device></device>", "<verify>verified</verify> session <device></device>",
{}, { validity, verify, device }, {}, { validity, verify, device },
); );
} else if (sig.valid && !sig.device.isVerified()) { } else if (sig.valid && !sig.deviceTrust.isVerified()) {
sigStatus = _t( sigStatus = _t(
"Backup has a <validity>valid</validity> signature from " + "Backup has a <validity>valid</validity> signature from " +
"<verify>unverified</verify> session <device></device>", "<verify>unverified</verify> session <device></device>",
{}, { validity, verify, device }, {}, { validity, verify, device },
); );
} else if (!sig.valid && sig.device.isVerified()) { } else if (!sig.valid && sig.deviceTrust.isVerified()) {
sigStatus = _t( sigStatus = _t(
"Backup has an <validity>invalid</validity> signature from " + "Backup has an <validity>invalid</validity> signature from " +
"<verify>verified</verify> session <device></device>", "<verify>verified</verify> session <device></device>",
{}, { validity, verify, device }, {}, { validity, verify, device },
); );
} else if (!sig.valid && !sig.device.isVerified()) { } else if (!sig.valid && !sig.deviceTrust.isVerified()) {
sigStatus = _t( sigStatus = _t(
"Backup has an <validity>invalid</validity> signature from " + "Backup has an <validity>invalid</validity> signature from " +
"<verify>unverified</verify> session <device></device>", "<verify>unverified</verify> session <device></device>",