PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3934 from matrix-org/travis/cross-signing-info

Browse source 
Add null check for cross-signing info in verification panel
This commit is contained in:
Travis Ralston 2020-01-24 09:49:30 -07:00 committed by GitHub
commit 1986f13275
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/right_panel/VerificationPanel.js
View file

@ -49,12 +49,13 @@ export default class VerificationPanel extends React.PureComponent {
Verify by emoji Verify by emoji
</AccessibleButton>; </AccessibleButton>;
if (request.requestEvent && request.requestEvent.getId()) { const crossSigningInfo = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
const myKeyId = MatrixClientPeg.get().getCrossSigningId();
if (request.requestEvent && request.requestEvent.getId() && crossSigningInfo) {
const qrCodeKeys = [ const qrCodeKeys = [
[MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()], [MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()],
[MatrixClientPeg.get().getCrossSigningId(), MatrixClientPeg.get().getCrossSigningId()], [myKeyId, myKeyId],
]; ];
const crossSigningInfo = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
const qrCode = <VerificationQRCode const qrCode = <VerificationQRCode
keyholderUserId={MatrixClientPeg.get().getUserId()} keyholderUserId={MatrixClientPeg.get().getUserId()}
requestEventId={request.requestEvent.getId()} requestEventId={request.requestEvent.getId()}