From 51b30aef1f4acb9543f3146dafd343f63a65ac19 Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Wed, 15 Jan 2025 15:21:52 -0300 Subject: [PATCH] Add string resources --- .../nostrsigner/relays/AmberRelayStat.kt | 38 ++++++++++--------- app/src/main/res/values/strings.xml | 7 ++++ 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/relays/AmberRelayStat.kt b/app/src/main/java/com/greenart7c3/nostrsigner/relays/AmberRelayStat.kt index 8a0ca68c..9a46abeb 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/relays/AmberRelayStat.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/relays/AmberRelayStat.kt @@ -46,24 +46,26 @@ object AmberRelayStats { notificationManager.createNotificationChannel(channel) val message = NostrSigner.getInstance().client.getAll().joinToString("\n") { - "${it.url} ${if (it.isConnected()) "connected" else "disconnected"}\n" + - "Ping: ${RelayStats.get(it.url).pingInMs}ms" + - if (get(it.url).sent > 0) { - " Sent: ${get(it.url).sent}" - } else { - "" + - if (get(it.url).received > 0) { - " Received: ${get(it.url).received}" - } else { - "" + - if (get(it.url).failed > 0) { - " Rejected by relay: ${get(it.url).failed}" - } else { - "" + - if (RelayStats.get(it.url).errorCounter > 0) " Error: ${RelayStats.get(it.url).errorCounter}" else "" - } - } - } + val connected = "${it.url} ${if (it.isConnected()) NostrSigner.getInstance().getString(R.string.connected) else NostrSigner.getInstance().getString(R.string.disconnected)}\n" + val ping = NostrSigner.getInstance().getString(R.string.ping_ms, RelayStats.get(it.url).pingInMs) + val sent = if (get(it.url).sent > 0) { + NostrSigner.getInstance().getString(R.string.sent, get(it.url).sent) + } else { + "" + } + val received = if (get(it.url).received > 0) { + NostrSigner.getInstance().getString(R.string.received, get(it.url).received) + } else { + "" + } + val failed = if (get(it.url).failed > 0) { + NostrSigner.getInstance().getString(R.string.rejected_by_relay, get(it.url).failed) + } else { + "" + } + val error = if (RelayStats.get(it.url).errorCounter > 0) NostrSigner.getInstance().getString(R.string.error, RelayStats.get(it.url).errorCounter) else "" + + connected + ping + sent + received + failed + error } val notificationBuilder = diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c2bc8db5..a17271f2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -477,4 +477,11 @@ Deleting %1$d old log entries Deleting %1$d/%2$d old log entries Database size: %1$s MB + connected + disconnected + Ping: %1$dms + " Sent: %1$d" + " Received: %1$d" + " Rejected by relay: %1$d" + " Error: %1$d"