From e1cf188fbe0ee4136d3b004bf09b26b675671c9b Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 23 Jun 2023 17:57:21 -0400
Subject: [PATCH] Displays an error message when it cannot parse the returning
 json from relays.

---
 .../ui/actions/RelayInformationDialog.kt      | 21 ++++++++++++++-----
 app/src/main/res/values/strings.xml           |  2 +-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelayInformationDialog.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelayInformationDialog.kt
index d9c0ff289..386c767b6 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelayInformationDialog.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelayInformationDialog.kt
@@ -305,14 +305,25 @@ fun loadRelayInfo(
             object : Callback {
                 override fun onResponse(call: Call, response: Response) {
                     response.use {
-                        if (it.isSuccessful) {
-                            onInfo(RelayInformation.fromJson(it.body.string()))
-                        } else {
+                        try {
+                            if (it.isSuccessful) {
+                                onInfo(RelayInformation.fromJson(it.body.string()))
+                            } else {
+                                scope.launch {
+                                    Toast
+                                        .makeText(
+                                            context,
+                                            context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                                            Toast.LENGTH_SHORT
+                                        ).show()
+                                }
+                            }
+                        } catch (e: Exception) {
                             scope.launch {
                                 Toast
                                     .makeText(
                                         context,
-                                        context.getString(R.string.an_error_ocurred_trying_to_get_relay_information),
+                                        context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
                                         Toast.LENGTH_SHORT
                                     ).show()
                             }
@@ -326,7 +337,7 @@ fun loadRelayInfo(
                         Toast
                             .makeText(
                                 context,
-                                context.getString(R.string.an_error_ocurred_trying_to_get_relay_information),
+                                context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
                                 Toast.LENGTH_SHORT
                             ).show()
                     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c061fab0e..8739c4f29 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -433,7 +433,7 @@
     <string name="sats_to_complete">Zapraiser at %1$s. %2$s sats to goal</string>
     <string name="read_from_relay">Read from Relay</string>
     <string name="write_to_relay">Write to Relay</string>
-    <string name="an_error_ocurred_trying_to_get_relay_information">An error ocurred trying to get relay information</string>
+    <string name="an_error_ocurred_trying_to_get_relay_information">An error ocurred trying to get relay information from %1$s</string>
     <string name="owner">Owner</string>
     <string name="version">Version</string>
     <string name="software">Software</string>