mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-17 05:55:00 +08:00
Merge pull request #4524 from matrix-org/dbkr/sessions_there_on_login_are_old
Treat sessions that are there when we log in as old
This commit is contained in:
commit
3502b90aeb
@ -107,7 +107,12 @@ export default class DeviceListener {
|
||||
}
|
||||
}
|
||||
|
||||
_onWillUpdateDevices = async (users) => {
|
||||
_onWillUpdateDevices = async (users, initialFetch) => {
|
||||
// If we didn't know about *any* devices before (ie. it's fresh login),
|
||||
// then they are all pre-existing devices, so ignore this and set the
|
||||
// devicesAtStart list to the devices that we see after the fetch.
|
||||
if (initialFetch) return;
|
||||
|
||||
const myUserId = MatrixClientPeg.get().getUserId();
|
||||
if (users.includes(myUserId)) this._ensureDeviceIdsAtStartPopulated();
|
||||
|
||||
@ -179,8 +184,6 @@ export default class DeviceListener {
|
||||
|
||||
const crossSigningReady = await cli.isCrossSigningReady();
|
||||
|
||||
this._ensureDeviceIdsAtStartPopulated();
|
||||
|
||||
if (this._dismissedThisDeviceToast) {
|
||||
ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
|
||||
} else {
|
||||
@ -235,6 +238,10 @@ export default class DeviceListener {
|
||||
}
|
||||
}
|
||||
|
||||
// This needs to be done after awaiting on downloadKeys() above, so
|
||||
// we make sure we get the devices after the fetch is done.
|
||||
this._ensureDeviceIdsAtStartPopulated();
|
||||
|
||||
// Unverified devices that were there last time the app ran
|
||||
// (technically could just be a boolean: we don't actually
|
||||
// need to remember the device IDs, but for the sake of
|
||||
|
@ -27,7 +27,7 @@ import { replaceableComponent } from '../../../utils/replaceableComponent';
|
||||
@replaceableComponent("views.toasts.UnverifiedSessionToast")
|
||||
export default class UnverifiedSessionToast extends React.PureComponent {
|
||||
static propTypes = {
|
||||
deviceId: PropTypes.object,
|
||||
deviceId: PropTypes.string,
|
||||
}
|
||||
|
||||
_onLaterClick = () => {
|
||||
|
Loading…
Reference in New Issue
Block a user