From 5796052f36cd0c380f9c2f950376df7be722362c Mon Sep 17 00:00:00 2001
From: davotoula <david.kaspar@gmail.com>
Date: Mon, 15 Sep 2025 18:21:34 +0200
Subject: [PATCH 1/4] added live/offline status indicator for the
 DisplayLiveBubbles method Checks streaming URLs for LiveActivitiesChannel and
 relay URLs for both channel types

---
 .../loggedIn/home/live/LiveStatusIndicator.kt | 100 ++++++++++++++++++
 .../home/live/RenderEphemeralBubble.kt        |   7 ++
 .../home/live/RenderLiveActivityBubble.kt     |   7 ++
 3 files changed, 114 insertions(+)
 create mode 100644 amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt
new file mode 100644
index 000000000..6aad8f356
--- /dev/null
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt
@@ -0,0 +1,100 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.ui.screen.loggedIn.home.live
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.emphChat.EphemeralChatChannel
+import com.vitorpamplona.amethyst.model.nip53LiveActivities.LiveActivitiesChannel
+import com.vitorpamplona.amethyst.service.OnlineChecker
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.coroutines.delay
+
+@Composable
+fun LiveStatusIndicator(
+    isOnline: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    Canvas(
+        modifier = modifier.size(8.dp),
+    ) {
+        drawCircle(
+            color = if (isOnline) Color.Red else Color.Black,
+            radius = size.minDimension / 2,
+        )
+    }
+}
+
+@Composable
+fun LiveStatusIndicatorForChannel(
+    channel: Channel,
+    accountViewModel: AccountViewModel,
+    modifier: Modifier = Modifier,
+) {
+    var isOnline by remember { mutableStateOf(false) }
+
+    LaunchedEffect(channel) {
+        while (true) {
+            isOnline = checkChannelIsOnline(channel, accountViewModel)
+            delay(30_000) // Check every 30 seconds
+        }
+    }
+
+    LiveStatusIndicator(isOnline = isOnline, modifier = modifier)
+}
+
+private suspend fun checkChannelIsOnline(
+    channel: Channel,
+    accountViewModel: AccountViewModel,
+): Boolean =
+    when (channel) {
+        is LiveActivitiesChannel -> {
+            // Check if streaming URL is online, fall back to relay check
+            val streamingUrl = channel.info?.streaming()
+            if (!streamingUrl.isNullOrBlank()) {
+                accountViewModel.checkVideoIsOnline(streamingUrl)
+            } else {
+                // Check relay connection
+                val relayUrl = channel.relayHintUrl()
+                if (relayUrl != null) {
+                    OnlineChecker.isOnline(relayUrl.url, accountViewModel.httpClientBuilder::okHttpClientForVideo)
+                } else {
+                    false
+                }
+            }
+        }
+        is EphemeralChatChannel -> {
+            // Check relay connection for ephemeral chat
+            val relayUrl = channel.roomId.relayUrl
+            OnlineChecker.isOnline(relayUrl.url, accountViewModel.httpClientBuilder::okHttpClientForVideo)
+        }
+        else -> false
+    }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/RenderEphemeralBubble.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/RenderEphemeralBubble.kt
index e56e00ac3..4a7886545 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/RenderEphemeralBubble.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/RenderEphemeralBubble.kt
@@ -26,6 +26,7 @@ import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.model.emphChat.EphemeralChatChannel
@@ -48,6 +49,12 @@ fun RenderEphemeralBubble(
             nav.nav { routeFor(channel) }
         },
     ) {
+        LiveStatusIndicatorForChannel(
+            channel = channel,
+            accountViewModel = accountViewModel,
+            modifier = Modifier.align(Alignment.CenterVertically),
+        )
+        Spacer(StdHorzSpacer)
         RenderUsers(channel, accountViewModel, nav)
         Spacer(StdHorzSpacer)
         Text(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/RenderLiveActivityBubble.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/RenderLiveActivityBubble.kt
index b2f0b7bda..7e85e3504 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/RenderLiveActivityBubble.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/RenderLiveActivityBubble.kt
@@ -26,6 +26,7 @@ import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.model.nip53LiveActivities.LiveActivitiesChannel
@@ -48,6 +49,12 @@ fun RenderLiveActivityBubble(
             nav.nav { routeFor(channel) }
         },
     ) {
+        LiveStatusIndicatorForChannel(
+            channel = channel,
+            accountViewModel = accountViewModel,
+            modifier = Modifier.align(Alignment.CenterVertically),
+        )
+        Spacer(StdHorzSpacer)
         RenderUsers(channel, accountViewModel, nav)
         Spacer(StdHorzSpacer)
         Text(

From f4501d799d2fb3c35c9fa8c0fe1fc8d911634a84 Mon Sep 17 00:00:00 2001
From: davotoula <david.kaspar@gmail.com>
Date: Mon, 15 Sep 2025 18:25:52 +0200
Subject: [PATCH 2/4] Added withContext(Dispatchers.IO) for network call

---
 .../loggedIn/home/live/LiveStatusIndicator.kt | 49 ++++++++++++-------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt
index 6aad8f356..9cd42712c 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt
@@ -20,6 +20,7 @@
  */
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.home.live
 
+import android.util.Log
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
@@ -36,7 +37,9 @@ import com.vitorpamplona.amethyst.model.emphChat.EphemeralChatChannel
 import com.vitorpamplona.amethyst.model.nip53LiveActivities.LiveActivitiesChannel
 import com.vitorpamplona.amethyst.service.OnlineChecker
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.withContext
 
 @Composable
 fun LiveStatusIndicator(
@@ -75,26 +78,34 @@ private suspend fun checkChannelIsOnline(
     channel: Channel,
     accountViewModel: AccountViewModel,
 ): Boolean =
-    when (channel) {
-        is LiveActivitiesChannel -> {
-            // Check if streaming URL is online, fall back to relay check
-            val streamingUrl = channel.info?.streaming()
-            if (!streamingUrl.isNullOrBlank()) {
-                accountViewModel.checkVideoIsOnline(streamingUrl)
-            } else {
-                // Check relay connection
-                val relayUrl = channel.relayHintUrl()
-                if (relayUrl != null) {
-                    OnlineChecker.isOnline(relayUrl.url, accountViewModel.httpClientBuilder::okHttpClientForVideo)
-                } else {
-                    false
+    withContext(Dispatchers.IO) {
+        try {
+            when (channel) {
+                is LiveActivitiesChannel -> {
+                    // Check if streaming URL is online, fall back to relay check
+                    val streamingUrl = channel.info?.streaming()
+                    if (!streamingUrl.isNullOrBlank()) {
+                        accountViewModel.checkVideoIsOnline(streamingUrl)
+                    } else {
+                        // Check relay connection
+                        val relayUrl = channel.relayHintUrl()
+                        if (relayUrl != null) {
+                            OnlineChecker.isOnline(relayUrl.url, accountViewModel.httpClientBuilder::okHttpClientForVideo)
+                        } else {
+                            false
+                        }
+                    }
                 }
+                is EphemeralChatChannel -> {
+                    // Check relay connection for ephemeral chat
+                    val relayUrl = channel.roomId.relayUrl
+                    OnlineChecker.isOnline(relayUrl.url, accountViewModel.httpClientBuilder::okHttpClientForVideo)
+                }
+                else -> false
             }
+        } catch (e: Exception) {
+            Log.d("LiveStatusIndicator", "Network error checking channel ${channel.toBestDisplayName()}: ${e.message}")
+            // Return false if any network error occurs
+            false
         }
-        is EphemeralChatChannel -> {
-            // Check relay connection for ephemeral chat
-            val relayUrl = channel.roomId.relayUrl
-            OnlineChecker.isOnline(relayUrl.url, accountViewModel.httpClientBuilder::okHttpClientForVideo)
-        }
-        else -> false
     }

From 1d0f584c3e6e12ea79d9a7615a9614ad3e79c179 Mon Sep 17 00:00:00 2001
From: davotoula <david.kaspar@gmail.com>
Date: Mon, 22 Sep 2025 13:58:48 +0200
Subject: [PATCH 3/4] use produceState instead of LaunchedEffect

---
 .../loggedIn/home/live/LiveStatusIndicator.kt  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt
index 9cd42712c..8a9c2966f 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt
@@ -24,11 +24,8 @@ import android.util.Log
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.produceState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
@@ -62,16 +59,17 @@ fun LiveStatusIndicatorForChannel(
     accountViewModel: AccountViewModel,
     modifier: Modifier = Modifier,
 ) {
-    var isOnline by remember { mutableStateOf(false) }
-
-    LaunchedEffect(channel) {
+    val isOnline by produceState(initialValue = false, key1 = channel) {
         while (true) {
-            isOnline = checkChannelIsOnline(channel, accountViewModel)
-            delay(30_000) // Check every 30 seconds
+            value = checkChannelIsOnline(channel, accountViewModel)
+            delay(30_000) // Poll every 30 seconds
         }
     }
 
-    LiveStatusIndicator(isOnline = isOnline, modifier = modifier)
+    LiveStatusIndicator(
+        isOnline = isOnline,
+        modifier = modifier,
+    )
 }
 
 private suspend fun checkChannelIsOnline(

From 6cffda09bb587e1f65f6ac3b38eb5e168f7b49ec Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Tue, 23 Sep 2025 11:59:59 +0000
Subject: [PATCH 4/4] New Crowdin translations by GitHub Action

---
 .../src/main/res/values-nl-rNL/strings.xml    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/amethyst/src/main/res/values-nl-rNL/strings.xml b/amethyst/src/main/res/values-nl-rNL/strings.xml
index 50d666ced..3db9ae5d1 100644
--- a/amethyst/src/main/res/values-nl-rNL/strings.xml
+++ b/amethyst/src/main/res/values-nl-rNL/strings.xml
@@ -148,6 +148,7 @@
     <string name="failed_to_save_the_video">De video is niet opgeslagen</string>
     <string name="upload_image">Afbeelding uploaden</string>
     <string name="take_a_picture">Neem een foto</string>
+    <string name="record_a_video">Video opnemen</string>
     <string name="record_a_message">Neem een bericht op</string>
     <string name="record_a_message_title">Neem een bericht op</string>
     <string name="record_a_message_description">Klik en houd vast om een bericht te opnemen</string>
@@ -163,6 +164,8 @@
     <string name="blocked_users">Geblokkeerde gebruikers</string>
     <string name="new_threads">Nieuwe onderwerpen</string>
     <string name="conversations">Discussies</string>
+    <string name="feed">Feed</string>
+    <string name="mod_queue">Modwachtrij</string>
     <string name="notes">Notes</string>
     <string name="replies">Reacties</string>
     <string name="mutual">Jouw</string>
@@ -437,6 +440,7 @@
     <string name="no">Nee</string>
     <string name="follow_list_selection">Volgerslijst</string>
     <string name="follow_list_kind3follows">Iedereen</string>
+    <string name="follow_list_kind3follows_users_only">Volg alle gebruikers</string>
     <string name="follow_list_kind3follows_proxy">Volgt via proxy</string>
     <string name="follow_list_aroundme">In de buurt</string>
     <string name="follow_list_global">Globaal</string>
@@ -655,6 +659,8 @@
     <string name="messages_new_subject_message">Uitleg aan leden</string>
     <string name="messages_new_subject_message_placeholder">De naam veranderen voor de nieuwe doelen.</string>
     <string name="paste_from_clipboard">Plakken vanaf klembord</string>
+    <string name="invalid_nip47_uri_title">Invalide NIP-47 URI</string>
+    <string name="invalid_nip47_uri_description">De URI %1$s is geen geldige NIP-47 login-URI.</string>
     <string name="language_description">Voor de interface van de app</string>
     <string name="theme_description">Donker-, Licht- of Systeemthema</string>
     <string name="automatically_load_images_gifs_description">Automatisch afbeeldingen en GIF\'s laden</string>
@@ -672,6 +678,9 @@
     <string name="media_added_to_profile_gallery">Media toegevoegd aan je profielgalerij</string>
     <string name="created_at">Gemaakt op</string>
     <string name="rules">Regels</string>
+    <string name="community_description">Over ons</string>
+    <string name="guidelines">Richtlijnen</string>
+    <string name="moderators">Moderators</string>
     <string name="login_with_external_signer">Login met Amber</string>
     <string name="status_update">Status bijwerken</string>
     <string name="lightning_wallets_not_found">Fout bij het parsen van foutberichten</string>
@@ -884,10 +893,13 @@
     <string name="dm_upload">DM uploaden</string>
     <string name="relay_settings">Relay-instellingen</string>
     <string name="public_home_section">Openbare thuis relays</string>
+    <string name="public_home_section_explainer_profile">Gebruiker plaatst zijn content op deze relays</string>
     <string name="public_home_section_explainer">Dit relay type slaat al je inhoud op. Amethyst stuurt je berichten hierheen en anderen gebruiken deze relays om je inhoud te vinden. Voeg tussen de 1 en 3 relays toe. Het gaat om persoonlijke relays, betaalde relays of openbare relays.</string>
     <string name="public_notif_section">Openbare inbox relays</string>
+    <string name="public_notif_section_explainer_profile">Gebruiker ontvangt meldingen voor deze relays</string>
     <string name="public_notif_section_explainer">Dit type relay ontvangt alle relays, reacties, likes en zaps op je berichten. Ze kunnen betaalde of gratis relays zijn. Limieten ingesteld door de relay beheerder kunnen de meldingen die u ontvangt beperken voor het goede en het slechte. Als u bijvoorbeeld wordt aangevallen door spam, kunnen betaalde relays de spam filteren. Invoegen tussen de 1 en 3 relays.</string>
     <string name="private_inbox_section">DM inbox relays</string>
+    <string name="private_inbox_section_explainer_profile">Gebruiker ontvangt DM\'s bij deze relays</string>
     <string name="private_inbox_section_explainer">Voeg tussen de 1 en 3 relays toe om als uw privéinbox te dienen. Anderen gebruiken deze relays om DM\'s naar u te sturen. DM Inbox relays moeten een bericht van iedereen accepteren, maar alleen om berichten te downloaden. Goede opties zijn:\n - inbox.nostr.wine (betaald)\n - you.nostr1.com (persoonlijke relays - betaald)</string>
     <string name="private_outbox_section">Privé relays</string>
     <string name="private_outbox_section_explainer">Plaats tussen de 1 tot 3 relays om gebeurtenissen op te slaan die niemand anders kan zien, zoals uw Concepten en/of app instellingen. Idealiter zijn deze relays lokaal of vereist authenticatie voordat de inhoud van elke gebruiker wordt gedownload.</string>
@@ -1002,6 +1014,7 @@
     <string name="torrent_download">Downloaden</string>
     <string name="torrent_failure">Kon bestand niet openen</string>
     <string name="torrent_no_apps">Geen torrent apps geïnstalleerd om het bestand te openen en te downloaden.</string>
+    <string name="torrent_no_info">Evenement heeft niet genoeg informatie om een magnet-link te maken</string>
     <string name="select_list_to_filter">Selecteer een lijst om de feed te filteren</string>
     <string name="temporary_account">Afmelden bij apparaatvergrendeling</string>
     <string name="private_message">Privébericht</string>
@@ -1009,9 +1022,18 @@
     <string name="group_relay">Chat relay</string>
     <string name="group_relay_explanation">De relay die alle gebruikers van deze chat gebruiken om verbinding te maken</string>
     <string name="share_image">Afbeelding delen…</string>
+    <string name="unable_to_share_image">Kan afbeelding niet delen, probeer het later opnieuw…</string>
     <string name="search_by_hashtag">Zoek hashtag: #%1$s</string>
     <string name="dont_translate_from">Niet vertalen van</string>
     <string name="dont_translate_from_description">Talen die hier getoond worden worden worden niet vertaald. Selecteer een taal om te verwijderen en het opnieuw te laten vertalen.</string>
     <string name="pause">Pauze</string>
     <string name="play">Afspelen</string>
+    <string name="open_dropdown_menu">Open dropdown-menu</string>
+    <string name="option_of">Optie %1$s van %2$s</string>
+    <string name="feed_filter_selected">Feed-filter, %1$s geselecteerd</string>
+    <string name="feed_filter_select_an_option">Feed-filter, %1$s</string>
+    <string name="crashreport_found">Crashrapport gevonden</string>
+    <string name="would_you_like_to_send_the_recent_crash_report_to_amethyst_in_a_dm_no_personal_information_will_be_shared">Wilt u het recente crashrapport verzenden naar Amethyst in een DM? Er zal geen persoonlijke informatie gedeeld worden</string>
+    <string name="crashreport_found_send">Verzenden</string>
+    <string name="this_message_will_disappear_in_days">Dit bericht zal verdwijnen in %1$d dagen</string>
 </resources>