From 63e1e0d894ddb19bf48c444ebfd7f0e9abbd3c06 Mon Sep 17 00:00:00 2001
From: R Midhun Suresh <hi@midhun.dev>
Date: Thu, 22 May 2025 14:33:48 +0530
Subject: [PATCH] Move store creation into migration methods

---
 src/store.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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