Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Replace uses of checkDeviceTrust with getDeviceVerificationStatus #10663

Merged
merged 12 commits into from
Apr 24, 2023
Merged

Replace uses of checkDeviceTrust with getDeviceVerificationStatus #10663

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4dffcf6
Use `fetchDevicesWithVerification` in DevicesPanel
richvdh Apr 14, 2023
f706559
A couple of simple uses of `checkDeviceTrust`
richvdh Apr 14, 2023
6c6fe7f
cases of `checkDeviceTrust` that need `asyncSome`
richvdh Apr 14, 2023
432e293
`isDeviceVerified`: switch to `getDeviceVerificationStatus`
richvdh Apr 14, 2023
ef47246
EventTile: use `getDeviceVerificationStatus`
richvdh Apr 14, 2023
9d2d47b
UserInfo step 1: `getE2EStatus`
richvdh Apr 14, 2023
edfad2b
UserInfo step 2: `DeviceItem`
richvdh Apr 14, 2023
74d5696
UserInfo step 3: `DevicesSection`
richvdh Apr 14, 2023
3c88d94
Add some comments on the last use of checkDeviceTrust
richvdh Apr 17, 2023
1cc6e40
remove unsed stub from createTestClient
richvdh Apr 17, 2023
8b72ebf
Apply suggestions from code review
richvdh Apr 24, 2023
02f8263
Update DeviceListener.ts
richvdh Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/DeviceListener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ export default class DeviceListener {

const deviceTrust = await cli
.getCrypto()
?.getDeviceVerificationStatus(cli.getUserId()!, device.deviceId!);
!.getDeviceVerificationStatus(cli.getUserId()!, device.deviceId!);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ! needs to be on .getCrypto()!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bah

if (!deviceTrust?.crossSigningVerified && !this.dismissed.has(device.deviceId)) {
if (this.ourDeviceIdsAtStart?.has(device.deviceId)) {
oldUnverifiedDeviceIds.add(device.deviceId);
Expand Down
3 changes: 1 addition & 2 deletions src/components/views/right_panel/UserInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,9 +1626,8 @@ const UserInfo: React.FC<IProps> = ({ user, room, onClose, phase = RightPanelPha
const e2eStatus = useAsyncMemo(async () => {
if (!isRoomEncrypted || !devices) {
return undefined;
} else {
return await getE2EStatus(cli, user.userId, devices);
}
return await getE2EStatus(cli, user.userId, devices);
}, [cli, isRoomEncrypted, user.userId, devices]);

const classes = ["mx_UserInfo"];
Expand Down