From cd03da54d5dd67de78411ab2770f3cf463422afd Mon Sep 17 00:00:00 2001
From: mtang-signal <mtang@signal.org>
Date: Tue, 16 Apr 2024 15:36:46 -0400
Subject: [PATCH] Fix note to self message detail text.

---
 .../thoughtcrime/securesms/components/FromTextView.java   | 8 +++++++-
 .../securesms/messagedetails/RecipientViewHolder.java     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
index 6202548b5a..b254011987 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
@@ -40,9 +40,15 @@ public class FromTextView extends SimpleEmojiTextView {
   }
 
   public void setText(Recipient recipient, @Nullable CharSequence fromString, @Nullable CharSequence suffix, boolean asThread) {
+    setText(recipient, fromString, suffix, asThread, false);
+  }
+
+  public void setText(Recipient recipient, @Nullable CharSequence fromString, @Nullable CharSequence suffix, boolean asThread, boolean showSelfAsYou) {
     SpannableStringBuilder builder  = new SpannableStringBuilder();
 
-    if (asThread && recipient.isSelf()) {
+    if (asThread && recipient.isSelf() && showSelfAsYou) {
+      builder.append(getContext().getString(R.string.Recipient_you));
+    } else if (asThread && recipient.isSelf()) {
       builder.append(getContext().getString(R.string.note_to_self));
     } else {
       builder.append(fromString);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/RecipientViewHolder.java b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/RecipientViewHolder.java
index 347a09f52b..6a9cf28268 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/RecipientViewHolder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/RecipientViewHolder.java
@@ -41,7 +41,7 @@ final class RecipientViewHolder extends RecyclerView.ViewHolder {
 
   void bind(RecipientDeliveryStatus data) {
     unidentifiedDeliveryIcon.setVisibility(TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(itemView.getContext()) && data.isUnidentified() ? View.VISIBLE : View.GONE);
-    fromView.setText(data.getRecipient());
+    fromView.setText(data.getRecipient(), data.getRecipient().getDisplayName(itemView.getContext()), null, true, true);
     avatar.setRecipient(data.getRecipient());
     badge.setBadgeFromRecipient(data.getRecipient());