From c4c542c73957d0dcf4c090acab28b974de816d8f Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Thu, 5 Sep 2024 08:37:15 -0400
Subject: [PATCH 1/2] Moves the last npub to hexkey for
 https://github.com/nostr-protocol/nips/pull/1341

---
 .../com/vitorpamplona/amethyst/model/AccountSettings.kt     | 3 +--
 .../vitorpamplona/quartz/signers/ExternalSignerLauncher.kt  | 6 +++---
 2 files changed, 4 insertions(+), 5 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 db09d95b6..ce9aa6caf 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
@@ -32,7 +32,6 @@ import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
 import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
 import com.vitorpamplona.quartz.encoders.toHexKey
-import com.vitorpamplona.quartz.encoders.toNpub
 import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
 import com.vitorpamplona.quartz.events.ContactListEvent
@@ -162,7 +161,7 @@ class AccountSettings(
         } else {
             when (val packageName = externalSignerPackageName) {
                 null -> NostrSignerInternal(keyPair)
-                else -> NostrSignerExternal(keyPair.pubKey.toHexKey(), ExternalSignerLauncher(keyPair.pubKey.toNpub(), packageName))
+                else -> NostrSignerExternal(keyPair.pubKey.toHexKey(), ExternalSignerLauncher(keyPair.pubKey.toHexKey(), packageName))
             }
         }
 
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/signers/ExternalSignerLauncher.kt b/quartz/src/main/java/com/vitorpamplona/quartz/signers/ExternalSignerLauncher.kt
index bd6b0644d..1fdbc6505 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/signers/ExternalSignerLauncher.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/signers/ExternalSignerLauncher.kt
@@ -92,7 +92,7 @@ class Result(
 }
 
 class ExternalSignerLauncher(
-    private val npub: String,
+    private val currentUserPubKeyHex: String,
     val signerPackageName: String,
 ) {
     private val contentCache = LruCache<String, (String) -> Unit>(50)
@@ -222,7 +222,7 @@ class ExternalSignerLauncher(
         intent.putExtra("pubKey", pubKey)
         intent.putExtra("id", id)
         if (type !== SignerType.GET_PUBLIC_KEY) {
-            intent.putExtra("current_user", npub)
+            intent.putExtra("current_user", currentUserPubKeyHex)
         } else {
             intent.putExtra("permissions", defaultPermissions())
         }
@@ -278,7 +278,7 @@ class ExternalSignerLauncher(
     ): kotlin.Result<String?> {
         val localData =
             if (signerType !== SignerType.GET_PUBLIC_KEY) {
-                arrayOf(*data, npub)
+                arrayOf(*data, currentUserPubKeyHex)
             } else {
                 data
             }

From adf5bbe80f4b73636713c76e7f0f0e2dbd656710 Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Thu, 5 Sep 2024 12:39:02 +0000
Subject: [PATCH 2/2] New Crowdin translations by GitHub Action

---
 amethyst/src/main/res/values-fr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/amethyst/src/main/res/values-fr/strings.xml b/amethyst/src/main/res/values-fr/strings.xml
index 86d26b465..c8d7fc1f9 100644
--- a/amethyst/src/main/res/values-fr/strings.xml
+++ b/amethyst/src/main/res/values-fr/strings.xml
@@ -819,4 +819,5 @@
     <string name="torrent_download">Télécharger</string>
     <string name="torrent_failure">Échec de l\'ouverture du fichier</string>
     <string name="torrent_no_apps">Aucune application torrent installée pour ouvrir et télécharger le fichier.</string>
+    <string name="select_list_to_filter">Sélectionnez une liste pour filtrer le fil</string>
 </resources>