From 0b2d9d6d182863c009a2d9fbb4668ca4843b42c4 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Mon, 27 Feb 2023 10:46:51 -0500
Subject: [PATCH] BugFix for invalid nip05 domain names crashing the app.

---
 .../amethyst/lnurl/Nip05Verifier.kt           | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/lnurl/Nip05Verifier.kt b/app/src/main/java/com/vitorpamplona/amethyst/lnurl/Nip05Verifier.kt
index 88720aeca..5dd87f1fb 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/lnurl/Nip05Verifier.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/lnurl/Nip05Verifier.kt
@@ -18,7 +18,7 @@ class Nip05Verifier {
   val client = OkHttpClient.Builder().build()
 
   fun assembleUrl(nip05address: String): String? {
-    val parts = nip05address.split("@")
+    val parts = nip05address.trim().split("@")
 
     if (parts.size == 2) {
       return "https://${parts[1]}/.well-known/nostr.json?name=${parts[0]}"
@@ -43,23 +43,27 @@ class Nip05Verifier {
     }
 
     withContext(Dispatchers.IO) {
-      val request: Request = Request.Builder().url(url).build()
+      try {
+        val request: Request = Request.Builder().url(url).build()
 
-      client.newCall(request).enqueue(object : Callback {
-        override fun onResponse(call: Call, response: Response) {
-          response.use {
-            if (it.isSuccessful)
-              onSuccess(it.body.string())
-            else
-              onError("Could not resolve ${nip05}. Error: ${it.code}. Check if the server up and if the address ${nip05} is correct")
+        client.newCall(request).enqueue(object : Callback {
+          override fun onResponse(call: Call, response: Response) {
+            response.use {
+              if (it.isSuccessful)
+                onSuccess(it.body.string())
+              else
+                onError("Could not resolve ${nip05}. Error: ${it.code}. Check if the server up and if the address ${nip05} is correct")
+            }
           }
-        }
 
-        override fun onFailure(call: Call, e: java.io.IOException) {
-          onError("Could not resolve ${url}. Check if the server up and if the address ${nip05} is correct")
-          e.printStackTrace()
-        }
-      })
+          override fun onFailure(call: Call, e: java.io.IOException) {
+            onError("Could not resolve ${url}. Check if the server up and if the address ${nip05} is correct")
+            e.printStackTrace()
+          }
+        })
+      } catch (e: java.lang.Exception) {
+        onError("Could not resolve '${url}': ${e.message}")
+      }
     }
   }