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

Convert DeviceListener to Typescript 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2020-05-22 12:54:03 +01:00
parent dc37469808
commit 3bf5e003a1
2 changed files with 45 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/@types/global.d.ts vendored
View File

@ -16,6 +16,7 @@ limitations under the License.
import * as ModernizrStatic from "modernizr"; import * as ModernizrStatic from "modernizr";
import ToastStore from "../stores/ToastStore"; import ToastStore from "../stores/ToastStore";
import DeviceListener from "../DeviceListener";
declare global { declare global {
interface Window { interface Window {
@ -25,6 +26,7 @@ declare global {
}; };
mx_ToastStore: ToastStore; mx_ToastStore: ToastStore;
mx_DeviceListener: DeviceListener;
} }
// workaround for https://github.com/microsoft/TypeScript/issues/30933 // workaround for https://github.com/microsoft/TypeScript/issues/30933

79
src/DeviceListener.js → src/DeviceListener.ts
View File

@ -29,28 +29,23 @@ function toastKey(deviceId) {
} }
export default class DeviceListener { export default class DeviceListener {
static sharedInstance() {
if (!global.mx_DeviceListener) global.mx_DeviceListener = new DeviceListener();
return global.mx_DeviceListener;
}
constructor() {
// device IDs for which the user has dismissed the verify toast ('Later') // device IDs for which the user has dismissed the verify toast ('Later')
this._dismissed = new Set(); private dismissed = new Set<string>();
// has the user dismissed any of the various nag toasts to setup encryption on this device? // has the user dismissed any of the various nag toasts to setup encryption on this device?
this._dismissedThisDeviceToast = false; private dismissedThisDeviceToast = false;
// cache of the key backup info // cache of the key backup info
this._keyBackupInfo = null; private keyBackupInfo: object = null;
this._keyBackupFetchedAt = null; private keyBackupFetchedAt: number = null;
// We keep a list of our own device IDs so we can batch ones that were already // We keep a list of our own device IDs so we can batch ones that were already
// there the last time the app launched into a single toast, but display new // there the last time the app launched into a single toast, but display new
// ones in their own toasts. // ones in their own toasts.
this._ourDeviceIdsAtStart = null; private ourDeviceIdsAtStart: Set<string> = null;
// The set of device IDs we're currently displaying toasts for // The set of device IDs we're currently displaying toasts for
this._displayingToastsForDeviceIds = new Set(); private displayingToastsForDeviceIds = new Set<string>();
static sharedInstance() {
if (!window.mx_DeviceListener) window.mx_DeviceListener = new DeviceListener();
return window.mx_DeviceListener;
} }
start() { start() {
@ -74,12 +69,12 @@ export default class DeviceListener {
MatrixClientPeg.get().removeListener('accountData', this._onAccountData); MatrixClientPeg.get().removeListener('accountData', this._onAccountData);
MatrixClientPeg.get().removeListener('sync', this._onSync); MatrixClientPeg.get().removeListener('sync', this._onSync);
} }
this._dismissed.clear(); this.dismissed.clear();
this._dismissedThisDeviceToast = false; this.dismissedThisDeviceToast = false;
this._keyBackupInfo = null; this.keyBackupInfo = null;
this._keyBackupFetchedAt = null; this.keyBackupFetchedAt = null;
this._ourDeviceIdsAtStart = null; this.ourDeviceIdsAtStart = null;
this._displayingToastsForDeviceIds = new Set(); this.displayingToastsForDeviceIds = new Set();
} }
/** /**
@ -87,29 +82,29 @@ export default class DeviceListener {
* *
* @param {String[]} deviceIds List of device IDs to dismiss notifications for * @param {String[]} deviceIds List of device IDs to dismiss notifications for
*/ */
async dismissUnverifiedSessions(deviceIds) { async dismissUnverifiedSessions(deviceIds: string[]) {
for (const d of deviceIds) { for (const d of deviceIds) {
this._dismissed.add(d); this.dismissed.add(d);
} }
this._recheck(); this._recheck();
} }
dismissEncryptionSetup() { dismissEncryptionSetup() {
this._dismissedThisDeviceToast = true; this.dismissedThisDeviceToast = true;
this._recheck(); this._recheck();
} }
_ensureDeviceIdsAtStartPopulated() { _ensureDeviceIdsAtStartPopulated() {
if (this._ourDeviceIdsAtStart === null) { if (this.ourDeviceIdsAtStart === null) {
const cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
this._ourDeviceIdsAtStart = new Set( this.ourDeviceIdsAtStart = new Set(
cli.getStoredDevicesForUser(cli.getUserId()).map(d => d.deviceId), cli.getStoredDevicesForUser(cli.getUserId()).map(d => d.deviceId),
); );
} }
} }
_onWillUpdateDevices = async (users, initialFetch) => { _onWillUpdateDevices = async (users: string[], initialFetch?: boolean) => {
// If we didn't know about *any* devices before (ie. it's fresh login), // 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 // then they are all pre-existing devices, so ignore this and set the
// devicesAtStart list to the devices that we see after the fetch. // devicesAtStart list to the devices that we see after the fetch.
@ -122,17 +117,17 @@ export default class DeviceListener {
// before we download any new ones. // before we download any new ones.
} }
_onDevicesUpdated = (users) => { _onDevicesUpdated = (users: string[]) => {
if (!users.includes(MatrixClientPeg.get().getUserId())) return; if (!users.includes(MatrixClientPeg.get().getUserId())) return;
this._recheck(); this._recheck();
} }
_onDeviceVerificationChanged = (userId) => { _onDeviceVerificationChanged = (userId: string) => {
if (userId !== MatrixClientPeg.get().getUserId()) return; if (userId !== MatrixClientPeg.get().getUserId()) return;
this._recheck(); this._recheck();
} }
_onUserTrustStatusChanged = (userId, trustLevel) => { _onUserTrustStatusChanged = (userId: string) => {
if (userId !== MatrixClientPeg.get().getUserId()) return; if (userId !== MatrixClientPeg.get().getUserId()) return;
this._recheck(); this._recheck();
} }
@ -163,11 +158,11 @@ export default class DeviceListener {
// & cache the result // & cache the result
async _getKeyBackupInfo() { async _getKeyBackupInfo() {
const now = (new Date()).getTime(); const now = (new Date()).getTime();
if (!this._keyBackupInfo || this._keyBackupFetchedAt < now - KEY_BACKUP_POLL_INTERVAL) { if (!this.keyBackupInfo || this.keyBackupFetchedAt < now - KEY_BACKUP_POLL_INTERVAL) {
this._keyBackupInfo = await MatrixClientPeg.get().getKeyBackupVersion(); this.keyBackupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
this._keyBackupFetchedAt = now; this.keyBackupFetchedAt = now;
} }
return this._keyBackupInfo; return this.keyBackupInfo;
} }
async _recheck() { async _recheck() {
@ -186,7 +181,7 @@ export default class DeviceListener {
const crossSigningReady = await cli.isCrossSigningReady(); const crossSigningReady = await cli.isCrossSigningReady();
if (this._dismissedThisDeviceToast) { if (this.dismissedThisDeviceToast) {
ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY); ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
} else { } else {
if (!crossSigningReady) { if (!crossSigningReady) {
@ -239,20 +234,20 @@ export default class DeviceListener {
// (technically could just be a boolean: we don't actually // (technically could just be a boolean: we don't actually
// need to remember the device IDs, but for the sake of // need to remember the device IDs, but for the sake of
// symmetry...). // symmetry...).
const oldUnverifiedDeviceIds = new Set(); const oldUnverifiedDeviceIds = new Set<string>();
// Unverified devices that have appeared since then // Unverified devices that have appeared since then
const newUnverifiedDeviceIds = new Set(); const newUnverifiedDeviceIds = new Set<string>();
// as long as cross-signing isn't ready, // as long as cross-signing isn't ready,
// you can't see or dismiss any device toasts // you can't see or dismiss any device toasts
if (crossSigningReady) { if (crossSigningReady) {
const devices = cli.getStoredDevicesForUser(cli.getUserId()); const devices = cli.getStoredDevicesForUser(cli.getUserId());
for (const device of devices) { for (const device of devices) {
if (device.deviceId == cli.deviceId) continue; if (device.deviceId === cli.deviceId) continue;
const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId); const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
if (!deviceTrust.isCrossSigningVerified() && !this._dismissed.has(device.deviceId)) { if (!deviceTrust.isCrossSigningVerified() && !this.dismissed.has(device.deviceId)) {
if (this._ourDeviceIdsAtStart.has(device.deviceId)) { if (this.ourDeviceIdsAtStart.has(device.deviceId)) {
oldUnverifiedDeviceIds.add(device.deviceId); oldUnverifiedDeviceIds.add(device.deviceId);
} else { } else {
newUnverifiedDeviceIds.add(device.deviceId); newUnverifiedDeviceIds.add(device.deviceId);
@ -289,12 +284,12 @@ export default class DeviceListener {
} }
// ...and hide any we don't need any more // ...and hide any we don't need any more
for (const deviceId of this._displayingToastsForDeviceIds) { for (const deviceId of this.displayingToastsForDeviceIds) {
if (!newUnverifiedDeviceIds.has(deviceId)) { if (!newUnverifiedDeviceIds.has(deviceId)) {
ToastStore.sharedInstance().dismissToast(toastKey(deviceId)); ToastStore.sharedInstance().dismissToast(toastKey(deviceId));
} }
} }
this._displayingToastsForDeviceIds = newUnverifiedDeviceIds; this.displayingToastsForDeviceIds = newUnverifiedDeviceIds;
} }
} }