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

Factor out this device check & reorder conditionals

pull/21833/head
David Baker 2019-04-09 13:47:25 +01:00
parent 7c1943ef4e
commit 0f1ebf8095
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,18 +221,19 @@ 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() && sig.valid) { } 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.device.getFingerprint() === MatrixClientPeg.get().getDeviceEd25519Key() && !sig.valid) { } else if (!sig.valid && fromThisDevice) {
// it can happen... // it can happen...
sigStatus = _t( sigStatus = _t(
"Backup has an <validity>invalid</validity> signature from this device", "Backup has an <validity>invalid</validity> signature from this device",