imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update user info for device and trust changes

Browse source 
This ensure the user info panel updates automatically for device and trust
changes.

Fixes https://github.com/vector-im/riot-web/issues/12134`
This commit is contained in:
J. Ryan Stinnett 2020-01-29 21:55:27 +00:00
parent d362cc0f41
commit 7a5bf8f102
2 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/DeviceListener.js
View file

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

30
src/components/views/right_panel/UserInfo.js
View file

@ -1092,22 +1092,32 @@ export const useDevices = (userId) => {
// Listen to changes // Listen to changes
useEffect(() => { useEffect(() => {
let cancel = false; let cancel = false;
const onDeviceVerificationChanged = (_userId, device) => { const updateDevices = async () => {
if (_userId === userId) { const newDevices = await cli.getStoredDevicesForUser(userId);
// no need to re-download the whole thing; just update our copy of the list. if (cancel) return;
setDevices(newDevices);
// 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);
});
}
}; };
const onDevicesUpdated = (users) => {
if (!users.includes(userId)) return;
updateDevices();
};
const onDeviceVerificationChanged = (_userId, device) => {
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("deviceVerificationChanged", onDeviceVerificationChanged);
cli.on("userTrustStatusChanged", onUserTrustStatusChanged);
// Handle being unmounted // Handle being unmounted
return () => { return () => {
cancel = true; cancel = true;
cli.removeListener("crypto.devicesUpdated", onDevicesUpdated);
cli.removeListener("deviceVerificationChanged", onDeviceVerificationChanged); cli.removeListener("deviceVerificationChanged", onDeviceVerificationChanged);
cli.removeListener("userTrustStatusChanged", onUserTrustStatusChanged);
}; };
}, [cli, userId]); }, [cli, userId]);