From 590bd21f62dcb9cda2fb3ceaa07273f35cdb6440 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 23 Mar 2026 13:03:43 -0400 Subject: [PATCH] UriParser might crash, wraps in a try catch --- .../com/vitorpamplona/amethyst/ui/MainActivity.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt index 9bc0d0057..26327122b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt @@ -193,11 +193,15 @@ fun uriToRoute( } if (isWalletConnectRoute(uri)) { - val url = UriParser(uri) - val nip47Uri = url.getQueryParameter("value") - if (nip47Uri != null) { - Nip47WalletConnect.parse(nip47Uri) - return Route.Nip47NWCSetup(nip47Uri) + try { + val url = UriParser(uri) + val nip47Uri = url.getQueryParameter("value") + if (nip47Uri != null) { + Nip47WalletConnect.parse(nip47Uri) + return Route.Nip47NWCSetup(nip47Uri) + } + } catch (e: Exception) { + if (e is CancellationException) throw e } }