From 7812667e691346065b73e6683e49d00cacfb209a Mon Sep 17 00:00:00 2001
From: alansley <aclansley@gmail.com>
Date: Fri, 30 Aug 2024 06:25:36 +1000
Subject: [PATCH] Merge branch 'strings-squashed' into SES360-time-date-formats

---
 .../conversation/disappearingmessages/DisappearingMessages.kt   | 1 -
 app/src/main/res/xml/preferences_privacy.xml                    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt
index e086c95924..08a2c5195b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt
@@ -19,7 +19,6 @@ import org.session.libsession.utilities.getExpirationTypeDisplayValue
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.showSessionDialog
 import org.thoughtcrime.securesms.ui.getSubbedCharSequence
-import org.thoughtcrime.securesms.ui.getSubbedString
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 import javax.inject.Inject
 import kotlin.time.Duration.Companion.milliseconds
diff --git a/app/src/main/res/xml/preferences_privacy.xml b/app/src/main/res/xml/preferences_privacy.xml
index b4082bd125..516a10b1b6 100644
--- a/app/src/main/res/xml/preferences_privacy.xml
+++ b/app/src/main/res/xml/preferences_privacy.xml
@@ -39,7 +39,7 @@
             android:key="pref_typing_indicators"
             android:title="@string/typingIndicators"
             android:summary="@string/typingIndicatorsDescription" />
-        <!-- TODO ACL: Need to show a live typing indicator here & remove the "(...)" from the above string (if it's there - it might have been removed now) -->
+        <!-- TODO ACL: Need to show a live typing indicator here! -->
 
     </PreferenceCategory>