From 6015c968f5b215bc01b54d915d6d83f19be79360 Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Mon, 11 Nov 2024 11:25:53 -0300
Subject: [PATCH] Fix initial decryption of mutelists when using amber

---
 .../amethyst/model/AccountSettings.kt           | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
index b767838f8..412762969 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
@@ -20,7 +20,9 @@
  */
 package com.vitorpamplona.amethyst.model
 
+import android.util.Log
 import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.service.Nip96MediaServers
 import com.vitorpamplona.amethyst.ui.tor.TorSettings
 import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
@@ -120,7 +122,6 @@ class AccountSettings(
     val pendingAttestations: MutableStateFlow<Map<HexKey, String>> = MutableStateFlow<Map<HexKey, String>>(mapOf()),
 ) {
     val saveable = MutableStateFlow(AccountSettingsUpdater(this))
-
     val syncedSettings: AccountSyncedSettings =
         backupSyncedSettings?.let { AccountSyncedSettings(it) }
             ?: AccountSyncedSettings(AccountSyncedSettingsInternal())
@@ -141,7 +142,19 @@ class AccountSettings(
         } else {
             when (val packageName = externalSignerPackageName) {
                 null -> NostrSignerInternal(keyPair)
-                else -> NostrSignerExternal(keyPair.pubKey.toHexKey(), ExternalSignerLauncher(keyPair.pubKey.toHexKey(), packageName))
+                else -> {
+                    val externalSignerLauncher = ExternalSignerLauncher(keyPair.pubKey.toHexKey(), packageName)
+                    // TODO: How to handle the launcher here?
+                    try {
+                        externalSignerLauncher.registerLauncher(
+                            launcher = { },
+                            contentResolver = Amethyst.instance::contentResolverFn,
+                        )
+                    } catch (e: Exception) {
+                        Log.d("AccountSettings", "Failed to initialize external signer", e)
+                    }
+                    NostrSignerExternal(keyPair.pubKey.toHexKey(), externalSignerLauncher)
+                }
             }
         }