diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c5cc57e1..77608678 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,7 +58,7 @@ diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt index 361b10f6..5d280896 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt @@ -67,81 +67,6 @@ class SignerProvider : ContentProvider() { } return try { when (uriString) { - "content://$appId.SIGN_MESSAGE" -> { - val message = projection?.first() - if (message == null) { - Log.d(Amber.TAG, "No message") - return null - } - val npub = IntentUtils.parsePubKey(projection[2]) - if (npub == null) { - Log.d(Amber.TAG, "No npub") - return null - } - val account = LocalPreferences.loadFromEncryptedStorageSync(context!!, npub) - if (account == null) { - Log.d(Amber.TAG, "No account from storage") - return null - } - val historyDatabase = Amber.instance.getHistoryDatabase(account.npub) - val permDao = Amber.instance.dao(account.npub) - val permission = - permDao - .getPermission( - packageName, - "SIGN_MESSAGE", - ) - val signPolicy = permDao.getSignPolicy(packageName) - val isRemembered = IntentUtils.isRemembered(signPolicy, permission) ?: return null - if (!isRemembered) { - scope.launch { - historyDatabase.dao().addHistory( - listOf( - HistoryEntity( - 0, - packageName, - uriString.replace("content://$appId.", ""), - null, - TimeUtils.now(), - false, - content = message, - ), - ), - account.npub, - ) - } - val cursor = - MatrixCursor(arrayOf("rejected")).also { - it.addRow(arrayOf("true")) - } - - return cursor - } - - val result = runBlocking { account.signString(message) } - scope.launch { - historyDatabase.dao().addHistory( - listOf( - HistoryEntity( - 0, - packageName, - "SIGN_MESSAGE", - null, - TimeUtils.now(), - true, - content = message, - ), - ), - account.npub, - ) - } - - val localCursor = MatrixCursor(arrayOf("signature", "event", "result")).also { - it.addRow(arrayOf(result, result, result)) - } - - return localCursor - } "content://$appId.SIGN_EVENT" -> { val json = projection?.first() if (json == null) { diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/models/Account.kt b/app/src/main/java/com/greenart7c3/nostrsigner/models/Account.kt index f2cf5e34..037a7d24 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/models/Account.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/models/Account.kt @@ -18,7 +18,6 @@ import com.vitorpamplona.quartz.nip17Dm.NIP17Factory import com.vitorpamplona.quartz.nip17Dm.messages.ChatMessageEvent import com.vitorpamplona.quartz.nip19Bech32.toNsec import com.vitorpamplona.quartz.nip49PrivKeyEnc.Nip49 -import com.vitorpamplona.quartz.nip55AndroidSigner.signString import com.vitorpamplona.quartz.nip57Zaps.LnZapRequestEvent import com.vitorpamplona.quartz.nip57Zaps.PrivateZapRequestBuilder import kotlinx.coroutines.CancellationException @@ -75,8 +74,6 @@ class Account( content: String, ): T = signer.signerSync.sign(createdAt, kind, tags, content) - fun signString(message: String): String = signString(message, signer.keyPair.privKey!!).toHexKey() - fun nip49Encrypt(password: String): String = Nip49().encrypt(signer.keyPair.privKey!!.toHexKey(), password) suspend fun nip44Encrypt(plainText: String, toPublicKey: String): String = signer.nip44Encrypt(plainText, toPublicKey) diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/models/Permission.kt b/app/src/main/java/com/greenart7c3/nostrsigner/models/Permission.kt index c0e08308..0ae01a0a 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/models/Permission.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/models/Permission.kt @@ -69,7 +69,6 @@ data class Permission( // LAST_COMMIT_CHECKED = "14ec14dac92d891715239bfb83ed1c9bdf2ac382" fun toLocalizedString(context: Context, shouldTranslateConnect: Boolean = false): String = when (type.trim()) { - "sign_message" -> context.getString(R.string.sign_message) "get_public_key" -> context.getString(R.string.read_your_public_key) "nip04_encrypt" -> { context.getString(R.string.encrypt_data_using_nip_4) @@ -626,7 +625,6 @@ val supportedKindNumbers = listOf( *(39003..39009).toList().map { Permission("sign_event", it) }.toTypedArray(), *(9000..9030).toList().map { Permission("sign_event", it) }.toTypedArray(), Permission("connect", null), - Permission("sign_message", null), Permission("nip04_encrypt", null), Permission("nip04_decrypt", null), Permission("nip44_decrypt", null), 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 da0e34d1..9b85aca7 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,6 @@ package com.greenart7c3.nostrsigner.models enum class SignerType { CONNECT, - SIGN_MESSAGE, SIGN_EVENT, NIP04_ENCRYPT, NIP04_DECRYPT, diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt index 83ebcec8..93502bea 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt @@ -221,7 +221,6 @@ object BunkerRequestUtils { } fun getTypeFromBunker(bunkerRequest: BunkerRequest): SignerType = when (bunkerRequest.method) { - "sign_message" -> SignerType.SIGN_MESSAGE "connect" -> SignerType.CONNECT "sign_event" -> SignerType.SIGN_EVENT "get_public_key" -> SignerType.GET_PUBLIC_KEY @@ -237,7 +236,6 @@ object BunkerRequestUtils { } fun getDataFromBunker(bunkerRequest: BunkerRequest): String = when (bunkerRequest.method) { - "sign_message" -> bunkerRequest.params.first() "connect" -> "ack" "sign_event" -> { val amberEvent = AmberEvent.fromJson(bunkerRequest.params.first()) diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentRateLimiter.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentRateLimiter.kt index cddf832a..7b5fbd28 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentRateLimiter.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentRateLimiter.kt @@ -137,7 +137,6 @@ object IntentRateLimitInspector { } private fun parseSignerType(value: String): SignerType? = when (value) { - "sign_message" -> SignerType.SIGN_MESSAGE "sign_event" -> SignerType.SIGN_EVENT "get_public_key" -> SignerType.GET_PUBLIC_KEY "nip04_encrypt" -> SignerType.NIP04_ENCRYPT 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 005b2cf6..5133c871 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentUtils.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentUtils.kt @@ -126,8 +126,6 @@ object IntentUtils { private val URL_ENCODED_REGEX = Regex("%[0-9a-fA-F]{2}") private fun parseSignerType(type: String?): SignerType = when (type) { - "sign_message" -> - SignerType.SIGN_MESSAGE "sign_event" -> SignerType.SIGN_EVENT "get_public_key" -> @@ -304,23 +302,6 @@ object IntentUtils { encryptedData = null, ) } - SignerType.SIGN_MESSAGE -> { - IntentData( - data = localData, - name = appName, - type = type, - pubKey = pubKey, - id = intent.getStringExtra("id") ?: "", - callBackUrl = callbackUrl, - compression = compressionType, - returnType = returnType, - permissions = listOf(), - currentAccount = "", - route = route, - event = null, - encryptedData = null, - ) - } SignerType.SIGN_PSBT -> { IntentData( data = localData, @@ -500,28 +481,6 @@ object IntentUtils { encryptedData = null, ) } - SignerType.SIGN_MESSAGE -> { - var npub = intent.getStringExtra("current_user") - if (npub != null) { - npub = parsePubKey(npub) - } - - IntentData( - data = data, - name = name, - type = type, - pubKey = pubKey, - id = id, - callBackUrl = intent.extras?.getString("callbackUrl"), - compression = compressionType, - returnType = returnType, - permissions = permissions?.map { Permission(it.type.trim(), it.kind, it.checked) }, - currentAccount = npub ?: Hex.decode(pubKey).toNpub(), - route = route, - event = null, - encryptedData = null, - ) - } SignerType.SIGN_PSBT -> { var npub = intent.getStringExtra("current_user") if (npub != null) { diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt index e3cf669d..1e497c27 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt @@ -412,59 +412,6 @@ fun BunkerMultiEventHomeScreen( onLoading = {}, ) } - } else if (request.request.method == "sign_message") { - if (rememberType != RememberType.NEVER && isChecked) { - AmberUtils.acceptOrRejectPermission( - application, - localKey, - SignerType.SIGN_MESSAGE, - null, - true, - rememberType, - thisAccount, - encryptedData = request.encryptedData, - ) - } - - dao.insertApplicationWithPermissions(application) - historyDatabase.dao().addHistory( - listOf( - HistoryEntity( - 0, - localKey, - SignerType.SIGN_MESSAGE.toString(), - null, - TimeUtils.now(), - isChecked, - content = request.request.params.first(), - ), - ), - thisAccount.npub, - ) - - val signedMessage = thisAccount.signString(request.request.params.first()) - BunkerRequestUtils.remove(request.request.id) - - if (isChecked) { - BunkerRequestUtils.sendBunkerResponse( - context, - thisAccount, - request, - BunkerResponse(request.request.id, signedMessage, null), - application.application.relays, - onLoading = {}, - onDone = {}, - ) - } else { - AmberUtils.sendBunkerError( - account = thisAccount, - bunkerRequest = request, - relays = application.application.relays, - context = context, - closeApplication = application.application.closeApplication, - onLoading = {}, - ) - } } else if (request.request is BunkerRequestConnect) { if (savedApplication == null) { dao.insertApplicationWithPermissions(application) diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerSingleEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerSingleEventHomeScreen.kt index 798fbaa8..6fe29bfa 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerSingleEventHomeScreen.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerSingleEventHomeScreen.kt @@ -877,63 +877,6 @@ fun BunkerSingleEventHomeScreen( ) }, ) - } else if (type == SignerType.SIGN_MESSAGE) { - val permission = - applicationEntity?.permissions?.firstOrNull { - it.pkKey == key && it.type == type.toString() - } - - val acceptUntil = permission?.acceptUntil ?: 0 - val rejectUntil = permission?.rejectUntil ?: 0 - - val acceptOrReject = if (rejectUntil == 0L && acceptUntil == 0L) { - null - } else if (rejectUntil > TimeUtils.now() && rejectUntil > 0) { - false - } else if (acceptUntil > TimeUtils.now() && acceptUntil > 0) { - true - } else { - null - } - - BunkerSignMessage( - modifier = modifier, - content = bunkerRequest.request.params.first(), - shouldRunOnAccept = acceptOrReject, - appName = appName, - onAccept = { - Amber.instance.applicationIOScope.launch(Dispatchers.IO) { - val result = account.signString(bunkerRequest.request.params.first()) - - BunkerRequestUtils.sendResult( - context = context, - account = account, - key = key, - response = result, - bunkerRequest = bunkerRequest, - kind = null, - onLoading = onLoading, - permissions = null, - appName = appName, - signPolicy = null, - shouldCloseApplication = bunkerRequest.closeApplication, - rememberType = it, - ) - } - }, - onReject = { - BunkerRequestUtils.sendRejection( - key = key, - account = account, - bunkerRequest = bunkerRequest, - appName = appName, - rememberType = it, - signerType = type, - kind = null, - onLoading = onLoading, - ) - }, - ) } else if (type == SignerType.SIGN_PSBT) { val psbtHex = bunkerRequest.request.params.first() val permission = diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt index 641d862b..b9366ce9 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt @@ -384,44 +384,6 @@ fun IntentMultiEventHomeScreen( ), ) } - } else if (type == SignerType.SIGN_MESSAGE) { - if (rememberType != RememberType.NEVER && isChecked) { - AmberUtils.updatePermission( - application, - localKey, - type, - null, - true, - rememberType, - encryptedData = intentData.encryptedData, - ) - permissionsChanged = true - } - - historyList.add( - HistoryEntity( - 0, - localKey, - type.toString(), - null, - TimeUtils.now(), - isChecked, - content = intentData.data, - ), - ) - - val signedMessage = thisAccount.signString(intentData.data) - if (isChecked) { - results.add( - Result( - null, - signature = signedMessage, - result = signedMessage, - id = intentData.id, - rejected = null, - ), - ) - } } else { if (rememberType != RememberType.NEVER && isChecked) { AmberUtils.updatePermission( diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentSingleEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentSingleEventHomeScreen.kt index 8e64a237..19560315 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentSingleEventHomeScreen.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentSingleEventHomeScreen.kt @@ -113,53 +113,6 @@ fun IntentSingleEventHomeScreen( ) } - SignerType.SIGN_MESSAGE -> { - val permission = - applicationEntity?.permissions?.firstOrNull { - it.pkKey == key && it.type == intentData.type.toString() - } - - val acceptOrReject = IntentUtils.isRemembered(applicationEntity?.application?.signPolicy, permission) - - SignMessage( - modifier = modifier, - content = intentData.data, - shouldRunOnAccept = acceptOrReject, - packageName = packageName, - onAccept = { - Amber.instance.applicationIOScope.launch(Dispatchers.IO) { - val result = account.signString(intentData.data) - IntentUtils.sendResult( - context, - packageName, - account, - key, - clipboardManager, - result, - result, - intentData, - null, - onLoading, - onRemoveIntentData = onRemoveIntentData, - rememberType = it, - ) - } - }, - onReject = { - IntentUtils.sendRejection( - key = key, - account = account, - intentData = intentData, - appName = appName, - rememberType = it, - onLoading = onLoading, - onRemoveIntentData = onRemoveIntentData, - kind = null, - ) - }, - ) - } - SignerType.SIGN_PSBT -> { val permission = applicationEntity?.permissions?.firstOrNull { diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SignMessage.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SignMessage.kt deleted file mode 100644 index b736cedb..00000000 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SignMessage.kt +++ /dev/null @@ -1,165 +0,0 @@ -package com.greenart7c3.nostrsigner.ui.components - -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.material3.Card -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.SpanStyle -import androidx.compose.ui.text.buildAnnotatedString -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.withStyle -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import com.greenart7c3.nostrsigner.R -import com.greenart7c3.nostrsigner.ui.RememberType - -@Composable -fun SignMessage( - modifier: Modifier, - content: String, - shouldRunOnAccept: Boolean?, - packageName: String?, - onAccept: (RememberType) -> Unit, - onReject: (RememberType) -> Unit, -) { - var rememberType by remember { - mutableStateOf(RememberType.NEVER) - } - - Column( - modifier, - ) { - LocalAppIcon(packageName) - - val message = stringResource(R.string.sign_message) - - Text( - buildAnnotatedString { - append(stringResource(R.string.requests_message, message)) - }, - fontSize = 18.sp, - ) - Spacer(Modifier.size(4.dp)) - - Card( - modifier = Modifier - .fillMaxWidth(), - ) { - Column(Modifier.padding(6.dp)) { - Text( - "Event content", - fontWeight = FontWeight.Bold, - ) - - Text( - content, - modifier = Modifier - .fillMaxWidth() - .padding(top = 8.dp), - ) - } - } - - Spacer(Modifier.weight(1f)) - - RememberMyChoice( - shouldRunOnAccept, - packageName, - false, - onAccept, - onReject, - ) { - rememberType = it - } - - AcceptRejectButtons( - onAccept = { - onAccept(rememberType) - }, - onReject = { - onReject(rememberType) - }, - ) - } -} - -@Composable -fun BunkerSignMessage( - modifier: Modifier, - content: String, - shouldRunOnAccept: Boolean?, - appName: String, - onAccept: (RememberType) -> Unit, - onReject: (RememberType) -> Unit, -) { - var rememberType by remember { - mutableStateOf(RememberType.NEVER) - } - - Column( - modifier, - ) { - val message = stringResource(R.string.sign_message) - - Text( - buildAnnotatedString { - withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) { - append(appName) - } - append(" requests $message") - }, - fontSize = 18.sp, - ) - Spacer(Modifier.size(4.dp)) - - Card( - modifier = Modifier - .fillMaxWidth(), - ) { - Column(Modifier.padding(6.dp)) { - Text( - stringResource(R.string.content), - fontWeight = FontWeight.Bold, - ) - - Text( - content, - modifier = Modifier - .fillMaxWidth() - .padding(top = 8.dp), - ) - } - } - - Spacer(Modifier.weight(1f)) - - RememberMyChoice( - shouldRunOnAccept, - null, - true, - onAccept, - onReject, - ) { - rememberType = it - } - - AcceptRejectButtons( - onAccept = { - onAccept(rememberType) - }, - onReject = { - onReject(rememberType) - }, - ) - } -} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-bn-rBD/strings.xml +++ b/app/src/main/res/values-bn-rBD/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-cy-rGB/strings.xml b/app/src/main/res/values-cy-rGB/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-cy-rGB/strings.xml +++ b/app/src/main/res/values-cy-rGB/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-da-rDK/strings.xml +++ b/app/src/main/res/values-da-rDK/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8634c861..ec4a568a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -197,7 +197,6 @@ möchte ein %1$s signieren möchte, dass du %1$s %1$s signieren - Nachricht signieren sign PSBT Sending Change diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index a7da1c67..9974ea4e 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-es-rMX/strings.xml +++ b/app/src/main/res/values-es-rMX/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-es-rUS/strings.xml +++ b/app/src/main/res/values-es-rUS/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 12b90cfd..42be3a08 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -197,7 +197,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message sign PSBT Sending Change diff --git a/app/src/main/res/values-et-rEE/strings.xml b/app/src/main/res/values-et-rEE/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-et-rEE/strings.xml +++ b/app/src/main/res/values-et-rEE/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-fo-rFO/strings.xml b/app/src/main/res/values-fo-rFO/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-fo-rFO/strings.xml +++ b/app/src/main/res/values-fo-rFO/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 914c5635..ba437ea0 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -197,7 +197,6 @@ veut que vous signiez un %1$s veut que vous %1$s Signer %1$s - signer le message sign PSBT Sending Change diff --git a/app/src/main/res/values-gu-rIN/strings.xml b/app/src/main/res/values-gu-rIN/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-gu-rIN/strings.xml +++ b/app/src/main/res/values-gu-rIN/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-hr-rHR/strings.xml +++ b/app/src/main/res/values-hr-rHR/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-kk-rKZ/strings.xml b/app/src/main/res/values-kk-rKZ/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-kk-rKZ/strings.xml +++ b/app/src/main/res/values-kk-rKZ/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-ks-rIN/strings.xml b/app/src/main/res/values-ks-rIN/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-ks-rIN/strings.xml +++ b/app/src/main/res/values-ks-rIN/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-ne-rNP/strings.xml b/app/src/main/res/values-ne-rNP/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-ne-rNP/strings.xml +++ b/app/src/main/res/values-ne-rNP/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-pcm-rNG/strings.xml b/app/src/main/res/values-pcm-rNG/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-pcm-rNG/strings.xml +++ b/app/src/main/res/values-pcm-rNG/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 596e9f9d..ed5bd0f0 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -195,7 +195,6 @@ quer que você assine uma %1$s quer você para %1$s Assinar %1$s - Assinar a mensagem sign PSBT Sending Change diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-ru-rUA/strings.xml b/app/src/main/res/values-ru-rUA/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-ru-rUA/strings.xml +++ b/app/src/main/res/values-ru-rUA/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-sa-rIN/strings.xml b/app/src/main/res/values-sa-rIN/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-sa-rIN/strings.xml +++ b/app/src/main/res/values-sa-rIN/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-sl-rSI/strings.xml +++ b/app/src/main/res/values-sl-rSI/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-sr-rSP/strings.xml +++ b/app/src/main/res/values-sr-rSP/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-sw-rKE/strings.xml b/app/src/main/res/values-sw-rKE/strings.xml index 8892745e..65582f1c 100644 --- a/app/src/main/res/values-sw-rKE/strings.xml +++ b/app/src/main/res/values-sw-rKE/strings.xml @@ -194,7 +194,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message sign PSBT Sending Change diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 4a9d6141..d2c5b851 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -197,7 +197,6 @@ bir %1$s imzalamanızı istiyor %1$s yapmanızı istiyor %1$s İmzala - mesajı imzala sign PSBT Sending Change diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-uz-rUZ/strings.xml b/app/src/main/res/values-uz-rUZ/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-uz-rUZ/strings.xml +++ b/app/src/main/res/values-uz-rUZ/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-vi-rVN/strings.xml +++ b/app/src/main/res/values-vi-rVN/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 052c02c4..270a95b6 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -175,7 +175,6 @@ 请求签署 %1$s 请求进行 %1$s 签署 %1$s - 签署消息 内容 Amber 正在后台运行 Bunker 通知 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-zh-rMO/strings.xml +++ b/app/src/main/res/values-zh-rMO/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml index 8081e51d..68302eb1 100644 --- a/app/src/main/res/values-zh-rSG/strings.xml +++ b/app/src/main/res/values-zh-rSG/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d6dd8c8d..351afe27 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -175,7 +175,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message content Amber is running in background Bunker Notifications diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index a5be17c0..0272f016 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -197,7 +197,6 @@ 请求签署 %1$s 请求进行 %1$s 签署 %1$s - 签署消息 sign PSBT Sending Change diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0ab265df..c133d6c0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -204,7 +204,6 @@ wants you to sign a %1$s wants you to %1$s Sign %1$s - sign message sign PSBT Sending Change diff --git a/app/src/offline/AndroidManifest.xml b/app/src/offline/AndroidManifest.xml index 1b5ef245..2846cc37 100644 --- a/app/src/offline/AndroidManifest.xml +++ b/app/src/offline/AndroidManifest.xml @@ -25,7 +25,7 @@ diff --git a/app/src/test/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtilsTest.kt b/app/src/test/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtilsTest.kt index 38047eee..a963427a 100644 --- a/app/src/test/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtilsTest.kt +++ b/app/src/test/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtilsTest.kt @@ -56,8 +56,8 @@ class BunkerRequestUtilsTest { // ===== getTypeFromBunker ===== @Test - fun `getTypeFromBunker returns SIGN_MESSAGE for sign_message`() { - assertEquals(SignerType.SIGN_MESSAGE, BunkerRequestUtils.getTypeFromBunker(mockBunkerRequest("sign_message"))) + fun `getTypeFromBunker returns INVALID for sign_message`() { + assertEquals(SignerType.INVALID, BunkerRequestUtils.getTypeFromBunker(mockBunkerRequest("sign_message"))) } @Test @@ -128,9 +128,9 @@ class BunkerRequestUtilsTest { // ===== getDataFromBunker ===== @Test - fun `getDataFromBunker returns first param for sign_message`() { + fun `getDataFromBunker returns empty string for sign_message`() { val request = mockBunkerRequest("sign_message", arrayOf("hello world")) - assertEquals("hello world", BunkerRequestUtils.getDataFromBunker(request)) + assertEquals("", BunkerRequestUtils.getDataFromBunker(request)) } @Test diff --git a/app/src/test/java/com/greenart7c3/nostrsigner/service/IntentUtilsBeforeAfterTest.kt b/app/src/test/java/com/greenart7c3/nostrsigner/service/IntentUtilsBeforeAfterTest.kt index 7ee39ddd..64e51500 100644 --- a/app/src/test/java/com/greenart7c3/nostrsigner/service/IntentUtilsBeforeAfterTest.kt +++ b/app/src/test/java/com/greenart7c3/nostrsigner/service/IntentUtilsBeforeAfterTest.kt @@ -351,7 +351,6 @@ class IntentUtilsBeforeAfterTest { * making the duplication even worse). */ private fun oldParseSignerType(type: String?) = when (type) { - "sign_message" -> "SIGN_MESSAGE" "sign_event" -> "SIGN_EVENT" "nip04_encrypt" -> "NIP04_ENCRYPT" "nip04_decrypt" -> "NIP04_DECRYPT" @@ -383,7 +382,6 @@ class IntentUtilsBeforeAfterTest { /** Expose the private parseSignerType for white-box testing. */ fun IntentUtils.parseSignerTypePublic(type: String?) = when (type) { - "sign_message" -> "SIGN_MESSAGE" "sign_event" -> "SIGN_EVENT" "get_public_key" -> "GET_PUBLIC_KEY" "nip04_encrypt" -> "NIP04_ENCRYPT"