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

Merge remote-tracking branch 'origin/develop' into dbkr/fix_style_linting

pull/21833/head
David Baker 2019-04-09 15:19:24 +01:00
parent 3727d85487 5542e305fd
commit ee19ecad82
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,17 +221,24 @@ export default class KeyBackupPanel extends React.PureComponent {
{sub} {sub}
</span>; </span>;
const device = sub => <span className="mx_KeyBackupPanel_deviceName">{deviceName}</span>; const device = sub => <span className="mx_KeyBackupPanel_deviceName">{deviceName}</span>;
const fromThisDevice = sig.device.getFingerprint() === MatrixClientPeg.get().getDeviceEd25519Key();
let sigStatus; let sigStatus;
if (!sig.device) { if (!sig.device) {
sigStatus = _t( sigStatus = _t(
"Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.", "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.",
{ deviceId: sig.deviceId }, { verify }, { deviceId: sig.deviceId }, { verify },
); );
} else if (sig.device.getFingerprint() === MatrixClientPeg.get().getDeviceEd25519Key()) { } else if (sig.valid && fromThisDevice) {
sigStatus = _t( sigStatus = _t(
"Backup has a <validity>valid</validity> signature from this device", "Backup has a <validity>valid</validity> signature from this device",
{}, { validity }, {}, { validity },
); );
} else if (!sig.valid && fromThisDevice) {
// it can happen...
sigStatus = _t(
"Backup has an <validity>invalid</validity> signature from this device",
{}, { validity },
);
} else if (sig.valid && sig.device.isVerified()) { } else if (sig.valid && sig.device.isVerified()) {
sigStatus = _t( sigStatus = _t(
"Backup has a <validity>valid</validity> signature from " + "Backup has a <validity>valid</validity> signature from " +