From 1e33f2163669c25317cb079d36128a6540078451 Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Wed, 18 Dec 2024 15:31:24 -0300 Subject: [PATCH] Revert "always return hex key for the get_public_key method" This reverts commit 225cba295b295b312bb26114956a55ae839e2c3d. --- .../main/java/com/greenart7c3/nostrsigner/SignerProvider.kt | 2 +- .../nostrsigner/ui/components/SingleEventHomeScreen.kt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt index 4bd014a7..db9173de 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt @@ -357,7 +357,7 @@ class SignerProvider : ContentProvider() { ) val cursor = MatrixCursor(arrayOf("signature", "result")) - val result = account.signer.keyPair.pubKey.toHexKey() + val result = if (sortOrder == null) account.signer.keyPair.pubKey.toNpub() else account.signer.keyPair.pubKey.toHexKey() cursor.addRow(arrayOf(result, result)) return cursor } diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SingleEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SingleEventHomeScreen.kt index 9777ac49..6bf5c19a 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SingleEventHomeScreen.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SingleEventHomeScreen.kt @@ -110,10 +110,11 @@ fun SingleEventHomeScreen( val sig = if (intentData.type == SignerType.CONNECT) { intentData.bunkerRequest!!.nostrConnectSecret.ifBlank { "ack" } - } else { + } else if (intentData.bunkerRequest != null) { account.signer.keyPair.pubKey.toHexKey() + } else { + account.signer.keyPair.pubKey.toNpub() } - coroutineScope.launch { sendResult( context,