Update user info for device and trust changes

This ensure the user info panel updates automatically for device and trust changes. Fixes https://github.com/vector-im/riot-web/issues/12134`

Author: jryans

src/DeviceListener.js

@@ -77,8 +77,8 @@ export default class DeviceListener {
  this._recheck();
  }
 
- _onDeviceVerificationChanged = (users) => {
- if (!users.includes(MatrixClientPeg.get().getUserId())) return;
+ _onDeviceVerificationChanged = (userId) => {
+ if (userId !== MatrixClientPeg.get().getUserId()) return;
  this._recheck();
  }
 

src/components/views/right_panel/UserInfo.js

@@ -1092,22 +1092,32 @@ export const useDevices = (userId) => {
  // Listen to changes
  useEffect(() => {
  let cancel = false;
+ const updateDevices = async () => {
+ const newDevices = await cli.getStoredDevicesForUser(userId);
+ if (cancel) return;
+ setDevices(newDevices);
+ };
+ const onDevicesUpdated = (users) => {
+ if (!users.includes(userId)) return;
+ updateDevices();
+ };
  const onDeviceVerificationChanged = (_userId, device) => {
- if (_userId === userId) {
- // no need to re-download the whole thing; just update our copy of the list.
-
- // Promise.resolve to handle transition from static result to promise; can be removed in future
- Promise.resolve(cli.getStoredDevicesForUser(userId)).then((devices) => {
- if (cancel) return;
- setDevices(devices);
- });
- }
+ if (_userId !== userId) return;
+ updateDevices();
+ };
+ const onUserTrustStatusChanged = (_userId, trustStatus) => {
+ if (_userId !== userId) return;
+ updateDevices();
  };
+ cli.on("crypto.devicesUpdated", onDevicesUpdated);
  cli.on("deviceVerificationChanged", onDeviceVerificationChanged);
+ cli.on("userTrustStatusChanged", onUserTrustStatusChanged);
  // Handle being unmounted
  return () => {
  cancel = true;
+ cli.removeListener("crypto.devicesUpdated", onDevicesUpdated);
  cli.removeListener("deviceVerificationChanged", onDeviceVerificationChanged);
+ cli.removeListener("userTrustStatusChanged", onUserTrustStatusChanged);
  };
  }, [cli, userId]);