From 4c8456c4af844ce48dd73c2689dd07a3f291bf87 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Mon, 8 Sep 2025 15:50:07 -0400
Subject: [PATCH] Fixes the crash on starting when the contentResolver is not
 ready yet.

---
 amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt | 2 +-
 .../amethyst/model/accountsCache/AccountCacheState.kt         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
index 4d7ab89c5..234325e73 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
@@ -161,7 +161,7 @@ class Amethyst : Application() {
         AccountCacheState(
             geolocationFlow = locationManager.geohashStateFlow,
             nwcFilterAssembler = sources.nwc,
-            contentResolver = contentResolver,
+            contentResolverFn = ::contentResolverFn,
             cache = cache,
             client = client,
         )
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/accountsCache/AccountCacheState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/accountsCache/AccountCacheState.kt
index 206c4a57f..8b0211636 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/accountsCache/AccountCacheState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/accountsCache/AccountCacheState.kt
@@ -44,7 +44,7 @@ import kotlinx.coroutines.flow.StateFlow
 class AccountCacheState(
     val geolocationFlow: StateFlow<LocationState.LocationResult>,
     val nwcFilterAssembler: NWCPaymentFilterAssembler,
-    val contentResolver: ContentResolver,
+    val contentResolverFn: () -> ContentResolver,
     val cache: LocalCache,
     val client: INostrClient,
 ) {
@@ -75,7 +75,7 @@ class AccountCacheState(
                             NostrSignerExternal(
                                 pubKey = accountSettings.keyPair.pubKey.toHexKey(),
                                 packageName = packageName,
-                                contentResolver = contentResolver,
+                                contentResolver = contentResolverFn(),
                             )
                     }
                 },