Merge branch 'main' of https://github.com/vitorpamplona/amethyst

app/src/main/res/values-cs/strings.xml

@@ -15,6 +15,7 @@
     <string name="group_picture">Obrázek skupiny</string>
     <string name="explicit_content">Explicitní obsah</string>
     <string name="spam">Spam</string>
+    <string name="spam_description">Počet spamových událostí z tohoto relé</string>
     <string name="impersonation">Zneužívání identity</string>
     <string name="illegal_behavior">Nezákonné jednání</string>
     <string name="other">Jiný</string>
@@ -93,6 +94,7 @@
     <string name="posts">Příspěvky</string>
     <string name="bytes">Byty</string>
     <string name="errors">Chyby</string>
+    <string name="errors_description">Počet chyb připojení v této relaci</string>
     <string name="home_feed">Domovský kanál</string>
     <string name="private_message_feed">Kanál soukromých zpráv</string>
     <string name="public_chat_feed">Kanál veřejného chatu</string>
@@ -388,6 +390,8 @@
     <string name="sats_to_complete">Zapraiser na %1$s. Do cíle zbývá %2$s sats</string>
     <string name="read_from_relay">Číst z Relay</string>
     <string name="write_to_relay">Zapisovat do Relay</string>
+    <string name="write_to_relay_description">Množství bajtů, které bylo odesláno na toto relé, včetně filtrů a událostí</string>
+    <string name="read_from_relay_description">Množství bajtů, které bylo přijato z tohoto relé, včetně filtrů a událostí</string>
     <string name="an_error_occurred_trying_to_get_relay_information">Při pokusu o získání informací z Relay se vyskytla chyba z %1$s</string>
     <string name="owner">Vlastník</string>
     <string name="version">Verze</string>
@@ -427,6 +431,7 @@
     <string name="are_you_sure_you_want_to_log_out">Odhlášení vymaže všechny vaše místní informace. Ujistěte se, že máte zálohované své privátní klíče, abyste se vyhnuli ztrátě účtu. Chcete pokračovat?</string>
     <string name="followed_tags">Sledované značky</string>
     <string name="relay_setup">Rele</string>
+    <string name="discover_content">Objevování poznámek</string>
     <string name="discover_marketplace">Trh</string>
     <string name="discover_live">Živě</string>
     <string name="discover_community">Komunita</string>
@@ -667,6 +672,14 @@
     <string name="show_npub_as_a_qr_code">Zobrazit npub jako QR kód</string>
     <string name="invalid_nip19_uri">Neplatná adresa</string>
     <string name="invalid_nip19_uri_description">Amethyst obdržel URI k otevření, ale tento URI byl neplatný: %1$s</string>
+    <string name="dm_relays_title">Relé DM Schránky</string>
+    <string name="dm_relays_through">Relé: %1$s</string>
+    <string name="dm_relays_regular">Používání běžných relé</string>
+    <string name="dm_relays_not_found">Nastavte svá relé soukromé schránky</string>
+    <string name="dm_relays_not_found_description">Toto nastavení umožňuje všem vědět, která relé použít při posílání zpráv vám. Bez nich můžete některé zprávy zmeškat.</string>
+    <string name="dm_relays_not_found_examples">Dobré možnosti jsou:\n - inbox.nostr.wine (placené)\n - you.nostr1.com (osobní relé - placené)</string>
+    <string name="dm_relays_not_found_editing">Vložte 1-3 relé, která budou sloužit jako vaše soukromá schránka. Relé DM schránky by měla přijímat jakékoli zprávy od kohokoli, ale pouze vám umožnit jejich stahování.</string>
+    <string name="dm_relays_not_found_create_now">Nastavit nyní</string>
     <string name="zap_the_devs_title">Zapni vývojáře!</string>
     <string name="zap_the_devs_description">Váš příspěvek nám pomáhá dělat rozdíl. Každý sat se počítá!</string>
     <string name="donate_now">Přispět nyní</string>
@@ -704,4 +717,9 @@
     <string name="it_s_not_possible_to_zap_to_a_draft_note">Není možné poslat zap konceptu</string>
     <string name="draft_note">Koncept</string>
     <string name="load_from_text">Ze zprávy</string>
+    <string name="dvm_looking_for_app">Hledání aplikace</string>
+    <string name="dvm_waiting_status">Požadavek na práci, čeká se na odpověď</string>
+    <string name="dvm_requesting_job">Žádost o práci od DVM</string>
+    <string name="nwc_payment_request">Žádost o platbu odeslána, čeká se na potvrzení z vaší peněženky</string>
+    <string name="dvm_waiting_to_confim_payment">Čekání na potvrzení platby DVM nebo na zaslání výsledků</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -15,6 +15,7 @@
     <string name="group_picture">Gruppenbild</string>
     <string name="explicit_content">Anstößiger Inhalt</string>
     <string name="spam">Spam</string>
+    <string name="spam_description">Anzahl der Spam-Ereignisse von diesem Relais</string>
     <string name="impersonation">Vortäuschung</string>
     <string name="illegal_behavior">Illegales Verhalten</string>
     <string name="other">Andere</string>
@@ -93,6 +94,7 @@
     <string name="posts">Beiträge</string>
     <string name="bytes">Bytes</string>
     <string name="errors">Fehler</string>
+    <string name="errors_description">Anzahl der Verbindungsfehler in dieser Sitzung</string>
     <string name="home_feed">Startseite</string>
     <string name="private_message_feed">Private Nachrichten</string>
     <string name="public_chat_feed">Öffentlicher Chat</string>
@@ -393,6 +395,8 @@ anz der Bedingungen ist erforderlich</string>
     <string name="sats_to_complete">Zapraiser bei %1$s. %2$s Sats bis zum Ziel</string>
     <string name="read_from_relay">Von Relay lesen</string>
     <string name="write_to_relay">In Relay schreiben</string>
+    <string name="write_to_relay_description">Die Menge in Bytes, die an dieses Relais gesendet wurde, einschließlich Filter und Ereignisse</string>
+    <string name="read_from_relay_description">Die Menge in Bytes, die von diesem Relais empfangen wurde, einschließlich Filter und Ereignisse</string>
     <string name="an_error_occurred_trying_to_get_relay_information">Ein Fehler ist beim Abrufen von Relay-Informationen von %1$s aufgetreten</string>
     <string name="owner">Inhaber</string>
     <string name="version">Version</string>
@@ -432,6 +436,7 @@ anz der Bedingungen ist erforderlich</string>
     <string name="are_you_sure_you_want_to_log_out">Das Abmelden löscht alle Ihre lokalen Informationen. Stellen Sie sicher, dass Sie Ihre privaten Schlüssel gesichert haben, um einen Kontoverlust zu vermeiden. Möchten Sie fortfahren?</string>
     <string name="followed_tags">Gefolgte Tags</string>
     <string name="relay_setup">Relais</string>
+    <string name="discover_content">Notizen Entdeckung</string>
     <string name="discover_marketplace">Marktplatz</string>
     <string name="discover_live">Live</string>
     <string name="discover_community">Gemeinschaft</string>
@@ -672,6 +677,14 @@ anz der Bedingungen ist erforderlich</string>
     <string name="show_npub_as_a_qr_code">Npub als QR-Code anzeigen</string>
     <string name="invalid_nip19_uri">Ungültige Adresse</string>
     <string name="invalid_nip19_uri_description">Amethyst hat eine URI zum Öffnen erhalten, aber diese URI war ungültig: %1$s</string>
+    <string name="dm_relays_title">DM Posteingangs-Relais</string>
+    <string name="dm_relays_through">Relais: %1$s</string>
+    <string name="dm_relays_regular">Verwendung regulärer Relais</string>
+    <string name="dm_relays_not_found">Richten Sie Ihre privaten Posteingangs-Relais ein</string>
+    <string name="dm_relays_not_found_description">Diese Einstellung lässt alle wissen, welche Relais verwendet werden sollen, wenn sie Nachrichten an Sie senden. Ohne diese könnten Sie einige Nachrichten verpassen.</string>
+    <string name="dm_relays_not_found_examples">Gute Optionen sind:\n - inbox.nostr.wine (bezahlt)\n - you.nostr1.com (persönliche Relais - bezahlt)</string>
+    <string name="dm_relays_not_found_editing">Fügen Sie 1-3 Relais ein, die als Ihr privater Posteingang dienen sollen. DM Posteingangs-Relais sollten Nachrichten von jedem akzeptieren, aber nur Ihnen erlauben, sie herunterzuladen.</string>
+    <string name="dm_relays_not_found_create_now">Jetzt einrichten</string>
     <string name="zap_the_devs_title">Zap die Entwickler!</string>
     <string name="zap_the_devs_description">Deine Spende hilft uns, einen Unterschied zu machen. Jeder Sat zählt!</string>
     <string name="donate_now">Jetzt spenden</string>
@@ -709,4 +722,9 @@ anz der Bedingungen ist erforderlich</string>
     <string name="it_s_not_possible_to_zap_to_a_draft_note">Es ist nicht möglich, zap Zahlung an einen Entwurf senden</string>
     <string name="draft_note">Entwurf</string>
     <string name="load_from_text">Aus Nachricht laden</string>
+    <string name="dvm_looking_for_app">Suche nach Anwendung</string>
+    <string name="dvm_waiting_status">Job angefordert, wartet auf Antwort</string>
+    <string name="dvm_requesting_job">Anforderung eines Jobs von DVM</string>
+    <string name="nwc_payment_request">Zahlungsanforderung gesendet, wartet auf Bestätigung Ihrer Geldbörse</string>
+    <string name="dvm_waiting_to_confim_payment">Warten auf Bestätigung der Zahlung durch DVM oder auf die Ergebnisse</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -15,6 +15,7 @@
     <string name="group_picture">Imagem do grupo</string>
     <string name="explicit_content">Conteúdo explícito</string>
     <string name="spam">Spam</string>
+    <string name="spam_description">O número de eventos de spam vindo deste relé</string>
     <string name="impersonation">Representação</string>
     <string name="illegal_behavior">Comportamento ilegal</string>
     <string name="other">Outro</string>
@@ -93,6 +94,7 @@
     <string name="posts">Postagens</string>
     <string name="bytes">Bytes</string>
     <string name="errors">Erros</string>
+    <string name="errors_description">O número de erros de conexão nesta sessão</string>
     <string name="home_feed">Feed principal</string>
     <string name="private_message_feed">Feed de mensagens privadas</string>
     <string name="public_chat_feed">Feed Chat Público</string>
@@ -388,6 +390,8 @@
     <string name="sats_to_complete">Arrecadação de Zaps em %1$s. %2$s sats para meta</string>
     <string name="read_from_relay">Ler do Relay</string>
     <string name="write_to_relay">Enviar para o Relay</string>
+    <string name="write_to_relay_description">A quantidade em bytes que foi enviada para este relé, incluindo filtros e eventos</string>
+    <string name="read_from_relay_description">A quantidade em bytes que foi recebida deste relé, incluindo filtros e eventos</string>
     <string name="an_error_occurred_trying_to_get_relay_information">Ocorreu um erro ao tentar obter informações do relay de %1$s</string>
     <string name="owner">Proprietário</string>
     <string name="version">Versão</string>
@@ -427,6 +431,7 @@
     <string name="are_you_sure_you_want_to_log_out">Sair exclui todas as suas informações locais. Certifique-se de fazer backup de suas chaves privadas para evitar a perda de sua conta. Você quer continuar?</string>
     <string name="followed_tags">Tags Seguidas</string>
     <string name="relay_setup">Relays</string>
+    <string name="discover_content">Descoberta de Notas</string>
     <string name="discover_marketplace">Mercado</string>
     <string name="discover_live">Ao vivo</string>
     <string name="discover_community">Comunidade</string>
@@ -667,6 +672,14 @@
     <string name="show_npub_as_a_qr_code">Mostrar npub como um código QR</string>
     <string name="invalid_nip19_uri">Endereço inválido</string>
     <string name="invalid_nip19_uri_description">O Amethyst recebeu um URI para abrir, mas esse URI era inválido: %1$s</string>
+    <string name="dm_relays_title">Relés da Caixa de Entrada de DM</string>
+    <string name="dm_relays_through">Relés: %1$s</string>
+    <string name="dm_relays_regular">Usando Relés Regulares</string>
+    <string name="dm_relays_not_found">Configurar seus relés de Caixa de Entrada Privada</string>
+    <string name="dm_relays_not_found_description">Esta configuração permite que todos saibam quais relés usar ao enviar mensagens para você. Sem eles, você pode perder algumas mensagens.</string>
+    <string name="dm_relays_not_found_examples">Boas opções são:\n - inbox.nostr.wine (pago)\n - you.nostr1.com (relés pessoais - pago)</string>
+    <string name="dm_relays_not_found_editing">Insira entre 1-3 relés para servir como sua caixa de entrada privada. Relés de Caixa de Entrada de DM devem aceitar qualquer mensagem de qualquer pessoa, mas permitir apenas você a baixá-las.</string>
+    <string name="dm_relays_not_found_create_now">Configurar agora</string>
     <string name="zap_the_devs_title">Zap os desenvolvedores!</string>
     <string name="zap_the_devs_description">Sua doação nos ajuda a fazer a diferença. Cada sat conta!</string>
     <string name="donate_now">Doar agora</string>
@@ -704,4 +717,9 @@
     <string name="it_s_not_possible_to_zap_to_a_draft_note">Não é possível fazer um zap em uma nota em rascunho</string>
     <string name="draft_note">Nota de rascunho</string>
     <string name="load_from_text">Carregar do texto</string>
+    <string name="dvm_looking_for_app">Procurando Aplicativo</string>
+    <string name="dvm_waiting_status">Trabalho Solicitado, aguardando resposta</string>
+    <string name="dvm_requesting_job">Solicitando Trabalho ao DVM</string>
+    <string name="nwc_payment_request">Pedido de pagamento enviado, aguardando confirmação da sua carteira</string>
+    <string name="dvm_waiting_to_confim_payment">Aguardando o DVM confirmar o pagamento ou enviar resultados</string>
 </resources>

app/src/main/res/values-sv-rSE/strings.xml

@@ -15,6 +15,7 @@
     <string name="group_picture">Grupp bild</string>
     <string name="explicit_content">Explicit Innehåll</string>
     <string name="spam">Spam</string>
+    <string name="spam_description">Antal skräpposthändelser från detta relä</string>
     <string name="impersonation">Imitation</string>
     <string name="illegal_behavior">Olagligt beteende</string>
     <string name="other">Annat</string>
@@ -93,6 +94,7 @@
     <string name="posts">Inlägg</string>
     <string name="bytes">Bytes</string>
     <string name="errors">Fel</string>
+    <string name="errors_description">Antal anslutningsfel under denna session</string>
     <string name="home_feed">Hem Flöde</string>
     <string name="private_message_feed">Privata Meddelande Flöde</string>
     <string name="public_chat_feed">Publik Chat Flöde</string>
@@ -387,6 +389,8 @@
     <string name="sats_to_complete">Zapraiser på %1$s. %2$s sats kvar till målet</string>
     <string name="read_from_relay">Läs från Relay</string>
     <string name="write_to_relay">Skriv till Relay</string>
+    <string name="write_to_relay_description">Mängden data i byte som skickades till detta relä, inklusive filter och händelser</string>
+    <string name="read_from_relay_description">Mängden data i byte som mottogs från detta relä, inklusive filter och händelser</string>
     <string name="an_error_occurred_trying_to_get_relay_information">Ett fel inträffade vid försök att hämta information från Relay %1$s</string>
     <string name="owner">Ägare</string>
     <string name="version">Version</string>
@@ -426,6 +430,7 @@
     <string name="are_you_sure_you_want_to_log_out">Att logga ut raderar all din lokala information. Se till att ha dina privata nycklar säkerhetskopierade för att undvika att förlora ditt konto. Vill du fortsätta?</string>
     <string name="followed_tags">Följda taggar</string>
     <string name="relay_setup">Reläer</string>
+    <string name="discover_content">Upptäckt av anteckningar</string>
     <string name="discover_marketplace">Marknadsplats</string>
     <string name="discover_live">Live</string>
     <string name="discover_community">Gemenskap</string>
@@ -666,6 +671,14 @@
     <string name="show_npub_as_a_qr_code">Visa npub som en QR-kod</string>
     <string name="invalid_nip19_uri">Ogiltig adress</string>
     <string name="invalid_nip19_uri_description">Amethyst fick en URI att öppna men den URI var ogiltig: %1$s</string>
+    <string name="dm_relays_title">DM Inkorg Reläer</string>
+    <string name="dm_relays_through">Reläer: %1$s</string>
+    <string name="dm_relays_regular">Använder vanliga reläer</string>
+    <string name="dm_relays_not_found">Ställ in dina privata inkorgsreläer</string>
+    <string name="dm_relays_not_found_description">Denna inställning låter alla veta vilka reläer som ska användas när de skickar meddelanden till dig. Utan dem kan du missa vissa meddelanden.</string>
+    <string name="dm_relays_not_found_examples">Bra alternativ är:\n - inbox.nostr.wine (betald)\n - you.nostr1.com (personliga reläer - betald)</string>
+    <string name="dm_relays_not_found_editing">Sätt in mellan 1-3 reläer för att fungera som din privata inkorg. DM Inkorg reläer bör acceptera alla meddelanden från vem som helst, men endast tillåta dig att ladda ner dem.</string>
+    <string name="dm_relays_not_found_create_now">Ställ in nu</string>
     <string name="zap_the_devs_title">Zappa utvecklarna!</string>
     <string name="zap_the_devs_description">Din donation hjälper oss att göra skillnad. Varje sat räknas!</string>
     <string name="donate_now">Donera nu</string>
@@ -703,4 +716,9 @@
     <string name="it_s_not_possible_to_zap_to_a_draft_note">Det går inte att zappa ett utkast</string>
     <string name="draft_note">Utkast</string>
     <string name="load_from_text">Från meddelande</string>
+    <string name="dvm_looking_for_app">Letar efter applikation</string>
+    <string name="dvm_waiting_status">Jobb begärt, väntar på svar</string>
+    <string name="dvm_requesting_job">Begär jobb från DVM</string>
+    <string name="nwc_payment_request">Betalningsbegäran skickad, väntar på bekräftelse från din plånbok</string>
+    <string name="dvm_waiting_to_confim_payment">Väntar på att DVM ska bekräfta betalningen eller skicka resultaten</string>
 </resources>

quartz/src/androidTest/java/com/vitorpamplona/quartz/crypto/CryptoUtilsTest.kt

@@ -120,4 +120,20 @@ class CryptoUtilsTest {
 
         assertEquals(msg, decrypted)
     }
+
+    @Test
+    fun signString() {
+        val random = "319cc5596fdd6cd767e5a59d976e8e059c61306af90dff1e6ee1067b3a1fdbc0".hexToByteArray()
+        val message = "8e58c8251bb406b6ded69e9eb14f55282a9a53bdab16fc49a3218c2ad3abc887".hexToByteArray()
+        val keyPair = KeyPair("a5ab474552c8f9c46c2eda5a0b68f27430ad81f96cb405e0cb4e34bf0c6494a2".hexToByteArray())
+
+        val signedMessage = CryptoUtils.sign(message, keyPair.privKey!!, random).toHexKey()
+        val expectedValue = "0f9be7e01ba53d5ee6874b9180c7956269fda7a5be424634c3d17b5cfcea6da001be89183876415ba08b7dafa6cff4555e393dc228fb8769b384344e9a27b77c"
+        assertEquals(expectedValue, signedMessage)
+
+        val message2 = "Hello"
+        val signedMessage2 = CryptoUtils.signString(message2, keyPair.privKey!!, random).toHexKey()
+        val expectedValue2 = "7ec8194a585bfb513564113b6b7bfeaafa0254c99d24eaf92280657c2291bab908b1b7bc553c83276a0254aef5041bbe6a50e93381edc4de3d859efa1c3a5a1e"
+        assertEquals(expectedValue2, signedMessage2)
+    }
 }

quartz/src/main/java/com/vitorpamplona/quartz/crypto/CryptoUtils.kt

@@ -64,10 +64,19 @@ object CryptoUtils {
         return secp256k1.secKeyVerify(il)
     }
 
+    fun signString(
+        message: String,
+        privKey: ByteArray,
+        auxrand32: ByteArray = random(32),
+    ): ByteArray {
+        return sign(sha256(message.toByteArray()), privKey, auxrand32)
+    }
+
     fun sign(
         data: ByteArray,
         privKey: ByteArray,
-    ): ByteArray = secp256k1.signSchnorr(data, privKey, null)
+        auxrand32: ByteArray? = null,
+    ): ByteArray = secp256k1.signSchnorr(data, privKey, auxrand32)
 
     fun verifySignature(
         signature: ByteArray,