From 0f1ebf8095b52b23f694c43721159c65592ad15f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 9 Apr 2019 13:47:25 +0100
Subject: [PATCH] Factor out this device check & reorder conditionals

---
 src/components/views/settings/KeyBackupPanel.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 82d464c05e..7667e11d46 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -221,18 +221,19 @@ export default class KeyBackupPanel extends React.PureComponent {
                         {sub}
                     </span>;
                 const device = sub => <span className="mx_KeyBackupPanel_deviceName">{deviceName}</span>;
+                const fromThisDevice = sig.device.getFingerprint() === MatrixClientPeg.get().getDeviceEd25519Key();
                 let sigStatus;
                 if (!sig.device) {
                     sigStatus = _t(
                         "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.",
                         { deviceId: sig.deviceId }, { verify },
                     );
-                } else if (sig.device.getFingerprint() === MatrixClientPeg.get().getDeviceEd25519Key() && sig.valid) {
+                } else if (sig.valid && fromThisDevice) {
                     sigStatus = _t(
                         "Backup has a <validity>valid</validity> signature from this device",
                         {}, { validity },
                     );
-                } else if (sig.device.getFingerprint() === MatrixClientPeg.get().getDeviceEd25519Key() && !sig.valid) {
+                } else if (!sig.valid && fromThisDevice) {
                     // it can happen...
                     sigStatus = _t(
                         "Backup has an <validity>invalid</validity> signature from this device",