From 918a2a59827f05f67a46b2b6396b4a2da457351e Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Tue, 1 Sep 2026 17:18:19 -0400
Subject: [PATCH] Fix forever muted dialog.

---
 .../sounds/SoundsAndNotificationsSettingsScreen.kt            | 4 +++-
 app/src/main/res/values/strings.xml                           | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsScreen.kt
index b9c91838c9..6d522ae30d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsScreen.kt
@@ -74,7 +74,9 @@ fun SoundsAndNotificationsSettingsScreen(
 
       // Mute
       item {
-        val muteSummary = if (isMuted) {
+        val muteSummary = if (isMuted && state.muteUntil == Long.MAX_VALUE) {
+          stringResource(R.string.ConversationSettingsFragment__conversation_muted_always)
+        } else if (isMuted) {
           formatMuteUntil(state.muteUntil)
         } else {
           stringResource(R.string.SoundsAndNotificationsSettingsFragment__not_muted)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0a9e4f541f..07fbab50e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6194,8 +6194,9 @@
     <string name="ConversationSettingsFragment__unmute">Unmute</string>
     <!-- The subtitle for a settings item that describes how long the user\'s chat is muted. If a chat is muted, you will not receive notifications unless @mentioned. The placeholder represents a time (e.g. 10pm, March 4, etc). -->
     <string name="ConversationSettingsFragment__conversation_muted_until_s">Chat muted until %1$s</string>
+    <string name="ConversationSettingsFragment__conversation_muted_forever">Chat muted forever</string>
     <!-- Subtitle when conversation is muted forever -->
-    <string name="ConversationSettingsFragment__conversation_muted_forever">Always</string>
+    <string name="ConversationSettingsFragment__conversation_muted_always">Always</string>
     <string name="ConversationSettingsFragment__copied_phone_number_to_clipboard">Copied phone number to clipboard.</string>
     <string name="ConversationSettingsFragment__phone_number">Phone number</string>
     <string name="ConversationSettingsFragment__get_badges">Get badges for your profile by supporting Signal. Tap on a badge to learn more.</string>