nikrozman/element-desktop
1
0
Fork 0
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases Activity

Move store creation into migration methods

Browse Source
This commit is contained in:
R Midhun Suresh
2025-05-22 14:33:48 +05:30
parent e326246669
commit 63e1e0d894
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/store.ts
View File

@@ -258,7 +258,6 @@ class Store extends ElectronStore<StoreData> {
} }
if (this.get("safeStorageBackendMigrate")) { if (this.get("safeStorageBackendMigrate")) {
this.secrets = new PlaintextStorageWriter(this);
return this.upgradeLinuxBackend2(); return this.upgradeLinuxBackend2();
} }
@@ -322,7 +321,6 @@ class Store extends ElectronStore<StoreData> {
if (safeStorageBackend === "basic_text") { if (safeStorageBackend === "basic_text") {
return this.upgradeLinuxBackend1(); return this.upgradeLinuxBackend1();
} else if (safeStorageBackend === "plaintext") { } else if (safeStorageBackend === "plaintext") {
this.secrets = new PlaintextStorageWriter(this);
this.upgradeLinuxBackend3(); this.upgradeLinuxBackend3();
} else if (safeStorageBackend in safeStorageBackendMap) { } else if (safeStorageBackend in safeStorageBackendMap) {
this.set("safeStorageBackendOverride", true); this.set("safeStorageBackendOverride", true);
@@ -383,7 +381,7 @@ class Store extends ElectronStore<StoreData> {
relaunchApp(); relaunchApp();
} }
private upgradeLinuxBackend2(): void { private upgradeLinuxBackend2(): void {
if (!this.secrets) throw new Error("safeStorage not ready"); this.secrets = new PlaintextStorageWriter(this);
console.info("Performing safeStorage migration"); console.info("Performing safeStorage migration");
const data = this.get("safeStorage"); const data = this.get("safeStorage");
if (data) { if (data) {
@@ -396,7 +394,7 @@ class Store extends ElectronStore<StoreData> {
relaunchApp(); relaunchApp();
} }
private upgradeLinuxBackend3(): void { private upgradeLinuxBackend3(): void {
if (!this.secrets) throw new Error("safeStorage not ready"); this.secrets = new PlaintextStorageWriter(this);
const selectedSafeStorageBackend = safeStorage.getSelectedStorageBackend(); const selectedSafeStorageBackend = safeStorage.getSelectedStorageBackend();
console.info(`Finishing safeStorage migration to ${selectedSafeStorageBackend}`); console.info(`Finishing safeStorage migration to ${selectedSafeStorageBackend}`);
const data = this.get("safeStorage"); const data = this.get("safeStorage");