From 20f12a48a45e968e36af1792516e7aadbb1fc8ee Mon Sep 17 00:00:00 2001
From: Jon Staab <jstaab@protonmail.com>
Date: Mon, 17 Aug 2026 16:10:00 -0700
Subject: [PATCH] Fix session persistence on android

---
 package.json            |  20 ++++++++++----------
 pnpm-lock.yaml          | Bin 382072 -> 380572 bytes
 src/app/storage.ts      |  27 ++++++++++++---------------
 src/routes/+page.svelte |   4 ++++
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index 57bd41ea..ff0ec991 100644
--- a/package.json
+++ b/package.json
@@ -76,16 +76,16 @@
     "@types/throttle-debounce": "^5.0.2",
     "@vite-pwa/assets-generator": "^1.0.2",
     "@vite-pwa/sveltekit": "^1.1.0",
-    "@welshman/app": "^0.9.0-pre6",
-    "@welshman/content": "^0.9.0-pre6",
-    "@welshman/domain": "^0.9.0-pre6",
-    "@welshman/editor": "^0.9.0-pre6",
-    "@welshman/feeds": "^0.9.0-pre6",
-    "@welshman/lib": "^0.9.0-pre6",
-    "@welshman/net": "^0.9.0-pre6",
-    "@welshman/signer": "^0.9.0-pre6",
-    "@welshman/store": "^0.9.0-pre6",
-    "@welshman/util": "^0.9.0-pre6",
+    "@welshman/app": "^0.9.0",
+    "@welshman/content": "^0.9.0",
+    "@welshman/domain": "^0.9.0",
+    "@welshman/editor": "^0.9.0",
+    "@welshman/feeds": "^0.9.0",
+    "@welshman/lib": "^0.9.0",
+    "@welshman/net": "^0.9.0",
+    "@welshman/signer": "^0.9.0",
+    "@welshman/store": "^0.9.0",
+    "@welshman/util": "^0.9.0",
     "cheerio": "^1.2.0",
     "compressorjs-next": "^1.1.2",
     "dompurify": "^3.4.13",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2e35138b70bee7ee47b5bd6038e8458438f330f6..d761f488b05e44be82e6fbcd65c99acab0186888 100644
GIT binary patch
delta 3194
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
Sw*dO`om*h*&aJ&aS^5tr?ie}%

delta 4777
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

diff --git a/src/app/storage.ts b/src/app/storage.ts
index be3d0e01..fec09344 100644
--- a/src/app/storage.ts
+++ b/src/app/storage.ts
@@ -3,7 +3,7 @@ import type {Unsubscriber} from "svelte/store"
 import {deleteDB} from "idb"
 import {SecureStorage} from "@aparajita/capacitor-secure-storage"
 import {Preferences} from "@capacitor/preferences"
-import {noop, on, throttle, batch, call} from "@welshman/lib"
+import {noop, on, throttle, batch, call, makeQueue} from "@welshman/lib"
 import type {Maybe} from "@welshman/lib"
 import {
   ALERT_ANDROID,
@@ -45,7 +45,7 @@ import {IDB} from "@lib/indexeddb"
 import {appPolicies} from "@app/core"
 
 export const kv = call(() => {
-  let p = Promise.resolve()
+  const enqueue = makeQueue()
 
   const get = async <T>(key: string): Promise<T | undefined> => {
     const result = await Preferences.get({key})
@@ -58,22 +58,18 @@ export const kv = call(() => {
   }
 
   const set = async <T>(key: string, value: T): Promise<void> => {
-    p = p.then(() => Preferences.set({key, value: JSON.stringify(value)}))
-
-    await p
+    await enqueue(() => Preferences.set({key, value: JSON.stringify(value)}))
   }
 
   const clear = async () => {
-    p = p.then(() => Preferences.clear())
-
-    await p
+    await enqueue(() => Preferences.clear())
   }
 
   return {get, set, clear}
 })
 
 export const ss = call(() => {
-  let p = Promise.resolve()
+  const enqueue = makeQueue()
 
   const get = async <T>(key: string): Promise<T | undefined> => {
     let value = await SecureStorage.getItem(key)
@@ -97,16 +93,17 @@ export const ss = call(() => {
     }
   }
 
+  // Android's SecureStorage rejects undefined
   const set = async <T>(key: string, value: T): Promise<void> => {
-    p = p.then(() => SecureStorage.setItem(key, JSON.stringify(value)))
-
-    await p
+    await enqueue(() =>
+      value === undefined
+        ? SecureStorage.removeItem(key)
+        : SecureStorage.setItem(key, JSON.stringify(value)),
+    )
   }
 
   const clear = async () => {
-    p = p.then(() => SecureStorage.clear())
-
-    await p
+    await enqueue(() => SecureStorage.clear())
   }
 
   return {get, set, clear}
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index c4009076..32fc047e 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,7 +1,11 @@
 <script lang="ts">
+  import {page} from "$app/stores"
   import {goToHome} from "@app/routes"
 
+  // Depend on the page so the redirect runs again instead of only on mount.
   $effect(() => {
+    void $page
+
     goToHome()
   })
 </script>