From daceba5e6a36a02af82cd9ea40a9deb51bfad3e8 Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Fri, 14 Feb 2025 06:23:19 -0300 Subject: [PATCH] Don't try to url decode for android apps --- .../com/greenart7c3/nostrsigner/service/IntentUtils.kt | 8 ++++++-- gradle/libs.versions.toml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) 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 561cba59..6f207f18 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentUtils.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentUtils.kt @@ -69,7 +69,11 @@ data class BunkerMetadata( } object IntentUtils { - fun decodeData(data: String, replace: Boolean = true): String { + fun decodeData(data: String, replace: Boolean = true, decodeData: Boolean = true): String { + if (!decodeData) { + if (!replace) return data.replace("nostrsigner:", "") + return data.replace("nostrsigner:", "").replace("+", "%2b") + } if (!replace) return URLDecoder.decode(data.replace("nostrsigner:", ""), "utf-8") return URLDecoder.decode(data.replace("nostrsigner:", "").replace("+", "%2b"), "utf-8") } @@ -296,7 +300,7 @@ object IntentUtils { val data = try { - decodeData(intent.data?.toString() ?: "", packageName == null) + decodeData(intent.data?.toString() ?: "", packageName == null, packageName == null) } catch (e: Exception) { intent.data?.toString()?.replace("nostrsigner:", "") ?: "" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2ae8bc61..08693ca2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,7 +22,7 @@ zxingAndroidEmbedded = "4.3.0" okhttp = "5.0.0-alpha.14" kotlin = "2.1.10" workRuntimeKtx = "2.10.0" -agp = "8.8.0" +agp = "8.8.1" ktlint = "12.1.2" ksp = "2.1.10-1.0.29" coil = "3.0.4"