PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Clear settings caches on reset rather than custom lifecycle method (#12859)

Browse source 
* Clear settings caches on reset

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Derp

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2024-08-05 11:36:24 +01:00 committed by GitHub
parent 090586439f
commit 54e5321f39
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Lifecycle.ts
View file

@ -58,7 +58,6 @@ import { setSentryUser } from "./sentry";
import SdkConfig from "./SdkConfig"; import SdkConfig from "./SdkConfig";
import { DialogOpener } from "./utils/DialogOpener"; import { DialogOpener } from "./utils/DialogOpener";
import { Action } from "./dispatcher/actions"; import { Action } from "./dispatcher/actions";
import AbstractLocalStorageSettingsHandler from "./settings/handlers/AbstractLocalStorageSettingsHandler";
import { OverwriteLoginPayload } from "./dispatcher/payloads/OverwriteLoginPayload"; import { OverwriteLoginPayload } from "./dispatcher/payloads/OverwriteLoginPayload";
import { SdkContextClass } from "./contexts/SDKContext"; import { SdkContextClass } from "./contexts/SDKContext";
import { messageForLoginError } from "./utils/ErrorUtils"; import { messageForLoginError } from "./utils/ErrorUtils";
@ -1087,7 +1086,6 @@ async function clearStorage(opts?: { deleteEverything?: boolean }): Promise<void
const registrationTime = window.localStorage.getItem("mx_registration_time"); const registrationTime = window.localStorage.getItem("mx_registration_time");
window.localStorage.clear(); window.localStorage.clear();
AbstractLocalStorageSettingsHandler.clear();
try { try {
await StorageAccess.idbDelete("account", ACCESS_TOKEN_STORAGE_KEY); await StorageAccess.idbDelete("account", ACCESS_TOKEN_STORAGE_KEY);

7
src/settings/handlers/AbstractLocalStorageSettingsHandler.ts
View file

@ -35,8 +35,7 @@ export default abstract class AbstractLocalStorageSettingsHandler extends Settin
} }
}; };
// Expose the clear event for Lifecycle to call, the storage listener only fires for changes from other tabs private static clear(): void {
public static clear(): void {
AbstractLocalStorageSettingsHandler.itemCache.clear(); AbstractLocalStorageSettingsHandler.itemCache.clear();
AbstractLocalStorageSettingsHandler.objectCache.clear(); AbstractLocalStorageSettingsHandler.objectCache.clear();
} }
@ -108,4 +107,8 @@ export default abstract class AbstractLocalStorageSettingsHandler extends Settin
public isSupported(): boolean { public isSupported(): boolean {
return localStorage !== undefined && localStorage !== null; return localStorage !== undefined && localStorage !== null;
} }
public reset(): void {
AbstractLocalStorageSettingsHandler.clear();
}
} }