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

Fix comments

pull/21833/head
Travis Ralston 2020-02-07 15:36:57 +00:00
parent bdeb9cccc4
commit f6abd369ca
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/elements/crypto/VerificationQRCode.js
View File

@ -34,7 +34,7 @@ export default class VerificationQRCode extends React.PureComponent {
// User verification use case only // User verification use case only
secret: PropTypes.string, secret: PropTypes.string,
otherUserKey: PropTypes.string, // Base64 key being verified otherUserKey: PropTypes.string, // Base64 key being verified
otherUserDeviceKey: PropTypes.string, // Base64 key of the other user's device (optional) otherUserDeviceKey: PropTypes.string, // Base64 key of the other user's device (or what we think it is; optional)
requestEventId: PropTypes.string, // for DM verification only requestEventId: PropTypes.string, // for DM verification only
}; };
@ -68,10 +68,10 @@ export default class VerificationQRCode extends React.PureComponent {
// Populate the keys we need depending on which direction and users are involved in the verification. // Populate the keys we need depending on which direction and users are involved in the verification.
if (myUserId === otherUserId) { if (myUserId === otherUserId) {
if (!otherDeviceId) { if (!otherDeviceId) {
// New -> Existing session QR code // Existing scanning New session's QR code
qrProps.otherUserDeviceKey = null; qrProps.otherUserDeviceKey = null;
} else { } else {
// Existing -> New session QR code // New scanning Existing session's QR code
const myDevices = (await cli.getStoredDevicesForUser(myUserId)) || []; const myDevices = (await cli.getStoredDevicesForUser(myUserId)) || [];
const device = myDevices.find(d => d.deviceId === otherDeviceId); const device = myDevices.find(d => d.deviceId === otherDeviceId);
if (device) qrProps.otherUserDeviceKey = device.getFingerprint(); if (device) qrProps.otherUserDeviceKey = device.getFingerprint();