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

Merge pull request #2508 from matrix-org/dbkr/fix_roomrecoveryreminder_npe 

Fix NPE in RoomRecoveryReminder
pull/21833/head
David Baker 2019-01-25 18:09:59 +00:00 committed by GitHub
parent 1b5be8603c de9b964490
commit 86e9417a19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/rooms/RoomRecoveryReminder.js
View File

@ -62,7 +62,7 @@ export default class RoomRecoveryReminder extends React.PureComponent {
let unverifiedDevice; let unverifiedDevice;
for (const sig of backupSigStatus.sigs) { for (const sig of backupSigStatus.sigs) {
if (!sig.device.isVerified()) { if (sig.device && !sig.device.isVerified()) {
unverifiedDevice = sig.device; unverifiedDevice = sig.device;
break; break;
} }
@ -133,12 +133,11 @@ export default class RoomRecoveryReminder extends React.PureComponent {
const AccessibleButton = sdk.getComponent("views.elements.AccessibleButton"); const AccessibleButton = sdk.getComponent("views.elements.AccessibleButton");
let body; let body;
let primaryCaption; let primaryCaption = _t("Set up");
if (this.state.error) { if (this.state.error) {
body = <div className="error"> body = <div className="error">
{_t("Unable to load key backup status")} {_t("Unable to load key backup status")}
</div>; </div>;
primaryCaption = _t("Set up");
} else if (this.state.unverifiedDevice) { } else if (this.state.unverifiedDevice) {
// A key backup exists for this account, but the creating device is not // A key backup exists for this account, but the creating device is not
// verified. // verified.