From 59ead050046f9b520c164da5a04696b2f7f132cd Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Wed, 29 May 2024 15:27:18 -0300 Subject: [PATCH] change sign type to sign_message, fix content provider --- app/src/main/AndroidManifest.xml | 2 +- .../greenart7c3/nostrsigner/SignerProvider.kt | 7 ++-- .../nostrsigner/models/SignerType.kt | 2 +- .../nostrsigner/service/IntentUtils.kt | 34 +++++++++++++++---- .../ui/components/MultiEventHomeScreen.kt | 2 +- .../ui/components/SingleEventHomeScreen.kt | 2 +- app/src/offline/AndroidManifest.xml | 2 +- 7 files changed, 36 insertions(+), 15 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f3a5fc5e..7959217b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,7 +21,7 @@ diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt index e17768de..28fed250 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt @@ -48,7 +48,7 @@ class SignerProvider : ContentProvider() { ): Cursor? { val appId = BuildConfig.APPLICATION_ID return when (uri.toString()) { - "content://$appId.SIGN" -> { + "content://$appId.SIGN_MESSAGE" -> { val packageName = callingPackage ?: return null val message = projection?.first() ?: return null if (!LocalPreferences.containsAccount(projection[2])) return null @@ -60,8 +60,7 @@ class SignerProvider : ContentProvider() { .applicationDao() .getPermission( sortOrder ?: packageName, - "SIGN", - null, + "SIGN_MESSAGE", ) if (currentSelection == "1") { val isRemembered = permission?.acceptable ?: return null @@ -104,7 +103,7 @@ class SignerProvider : ContentProvider() { HistoryEntity( 0, sortOrder ?: packageName, - "SIGN", + "SIGN_MESSAGE", null, TimeUtils.now(), true, diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/models/SignerType.kt b/app/src/main/java/com/greenart7c3/nostrsigner/models/SignerType.kt index 6bc7e6d5..bf7b515b 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/models/SignerType.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/models/SignerType.kt @@ -2,7 +2,7 @@ package com.greenart7c3.nostrsigner.models enum class SignerType { CONNECT, - SIGN, + SIGN_MESSAGE, SIGN_EVENT, NIP04_ENCRYPT, NIP04_DECRYPT, diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentUtils.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentUtils.kt index 8a0c1cf5..882d6971 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentUtils.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentUtils.kt @@ -77,7 +77,7 @@ object IntentUtils { if (parameter == "type") { type = when (parameterData) { - "sign" -> SignerType.SIGN + "sign_message" -> SignerType.SIGN_MESSAGE "sign_event" -> SignerType.SIGN_EVENT "get_public_key" -> SignerType.GET_PUBLIC_KEY "nip04_encrypt" -> SignerType.NIP04_ENCRYPT @@ -198,7 +198,7 @@ object IntentUtils { ), ) } - SignerType.SIGN -> { + SignerType.SIGN_MESSAGE -> { onReady( IntentData( localData, @@ -227,7 +227,7 @@ object IntentUtils { fun getTypeFromBunker(bunkerRequest: BunkerRequest): SignerType { return when (bunkerRequest.method) { - "sign" -> SignerType.SIGN + "sign_message" -> SignerType.SIGN_MESSAGE "connect" -> SignerType.CONNECT "sign_event" -> SignerType.SIGN_EVENT "get_public_key" -> SignerType.GET_PUBLIC_KEY @@ -241,7 +241,7 @@ object IntentUtils { fun getDataFromBunker(bunkerRequest: BunkerRequest): String { return when (bunkerRequest.method) { - "sign" -> bunkerRequest.params.first() + "sign_message" -> bunkerRequest.params.first() "connect" -> "ack" "sign_event" -> { val amberEvent = AmberEvent.fromJson(bunkerRequest.params.first()) @@ -450,7 +450,7 @@ object IntentUtils { ), ) } - SignerType.SIGN -> { + SignerType.SIGN_MESSAGE -> { onReady( IntentData( data, @@ -484,7 +484,7 @@ object IntentUtils { ) { val type = when (intent.extras?.getString("type")) { - "sign" -> SignerType.SIGN + "sign_message" -> SignerType.SIGN_MESSAGE "sign_event" -> SignerType.SIGN_EVENT "nip04_encrypt" -> SignerType.NIP04_ENCRYPT "nip04_decrypt" -> SignerType.NIP04_DECRYPT @@ -613,6 +613,28 @@ object IntentUtils { ), ) } + SignerType.SIGN_MESSAGE -> { + onReady( + IntentData( + data, + name, + type, + pubKey, + id, + intent.extras?.getString("callbackUrl"), + compressionType, + returnType, + permissions, + intent.extras?.getString("current_user") ?: Hex.decode(pubKey).toNpub(), + mutableStateOf(true), + mutableStateOf(false), + null, + route, + null, + null, + ), + ) + } else -> onReady(null) } } diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/MultiEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/MultiEventHomeScreen.kt index 0b4b4294..42e125c9 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/MultiEventHomeScreen.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/MultiEventHomeScreen.kt @@ -242,7 +242,7 @@ fun MultiEventHomeScreen( ), ) } - } else if (intentData.type == SignerType.SIGN) { + } else if (intentData.type == SignerType.SIGN_MESSAGE) { if (intentData.rememberMyChoice.value) { AmberUtils.acceptOrRejectPermission( key, 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 86b265c6..d974fd83 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 @@ -193,7 +193,7 @@ fun SingleEventHomeScreen( ) } - SignerType.SIGN -> { + SignerType.SIGN_MESSAGE -> { val permission = applicationEntity?.permissions?.firstOrNull { it.pkKey == key && it.type == intentData.type.toString() diff --git a/app/src/offline/AndroidManifest.xml b/app/src/offline/AndroidManifest.xml index 8a0cc2d1..d162a8df 100644 --- a/app/src/offline/AndroidManifest.xml +++ b/app/src/offline/AndroidManifest.xml @@ -20,7 +20,7 @@