From dd345cbf074bb54e7e86d1f4e2a82f446f3dd2d3 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Mon, 31 Jul 2023 19:40:20 +0930
Subject: [PATCH] Hide sender prefix for note to self

---
 .../securesms/home/ConversationView.kt         | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
index 454bcef18..5191e05d7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
@@ -136,17 +136,19 @@ class ConversationView : LinearLayout {
         else -> recipient.toShortString() // Internally uses the Contact API
     }
 
-    private fun getSnippet(thread: ThreadRecord): CharSequence {
-        thread.apply {
-            val body = getDisplayBody(context)
+    private fun getSnippet(thread: ThreadRecord): CharSequence = thread.run {
+        val body = getDisplayBody(context)
 
-            val snippetAuthor = lastMessage?.individualRecipient
-
-            return if (lastMessage?.isOutgoing == true) {
+        when {
+            recipient.isLocalNumber -> body // Note to self
+            lastMessage?.isOutgoing == true -> {
                 TextUtils.concat(resources.getString(R.string.MessageRecord_you), ": ", body)
-            } else {
-                return snippetAuthor?.toShortString()?.let { TextUtils.concat(it, ": ", body) } ?: body
             }
+            else -> lastMessage
+                ?.individualRecipient
+                ?.toShortString()
+                ?.let { TextUtils.concat(it, ": ", body) }
+                ?: body
         }
     }
     // endregion