From 54e5321f39e24b03c6830c505e3cec9ad1539432 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 5 Aug 2024 11:36:24 +0100
Subject: [PATCH] Clear settings caches on reset rather than custom lifecycle
 method (#12859)

* 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>
---
 src/Lifecycle.ts                                           | 2 --
 .../handlers/AbstractLocalStorageSettingsHandler.ts        | 7 +++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Lifecycle.ts b/src/Lifecycle.ts
index 682ecb0c53..87ad6e799f 100644
--- a/src/Lifecycle.ts
+++ b/src/Lifecycle.ts
@@ -58,7 +58,6 @@ import { setSentryUser } from "./sentry";
 import SdkConfig from "./SdkConfig";
 import { DialogOpener } from "./utils/DialogOpener";
 import { Action } from "./dispatcher/actions";
-import AbstractLocalStorageSettingsHandler from "./settings/handlers/AbstractLocalStorageSettingsHandler";
 import { OverwriteLoginPayload } from "./dispatcher/payloads/OverwriteLoginPayload";
 import { SdkContextClass } from "./contexts/SDKContext";
 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");
 
         window.localStorage.clear();
-        AbstractLocalStorageSettingsHandler.clear();
 
         try {
             await StorageAccess.idbDelete("account", ACCESS_TOKEN_STORAGE_KEY);
diff --git a/src/settings/handlers/AbstractLocalStorageSettingsHandler.ts b/src/settings/handlers/AbstractLocalStorageSettingsHandler.ts
index bcc72055f4..fb640fe313 100644
--- a/src/settings/handlers/AbstractLocalStorageSettingsHandler.ts
+++ b/src/settings/handlers/AbstractLocalStorageSettingsHandler.ts
@@ -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
-    public static clear(): void {
+    private static clear(): void {
         AbstractLocalStorageSettingsHandler.itemCache.clear();
         AbstractLocalStorageSettingsHandler.objectCache.clear();
     }
@@ -108,4 +107,8 @@ export default abstract class AbstractLocalStorageSettingsHandler extends Settin
     public isSupported(): boolean {
         return localStorage !== undefined && localStorage !== null;
     }
+
+    public reset(): void {
+        AbstractLocalStorageSettingsHandler.clear();
+    }
 }