From 83ea919434d2dbdf8670855fd62cc4843bf28a26 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 5 Feb 2020 11:36:57 -0500
Subject: [PATCH] Remove "(You)" from the reactions details.

This reverts commit ed2b049ad424f0e9ead5dc95012a6d9a929febbb.
---
 .../reactions/ReactionRecipientsAdapter.java    | 17 +++--------------
 app/src/main/res/values/strings.xml             |  1 -
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java
index 1e52d28c41..d6d8494da2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.reactions;
 
-import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -46,13 +45,13 @@ final class ReactionRecipientsAdapter extends RecyclerView.Adapter<ReactionRecip
     return data.size();
   }
 
-  final static class ViewHolder extends RecyclerView.ViewHolder {
+  final class ViewHolder extends RecyclerView.ViewHolder {
 
     private final AvatarImageView avatar;
     private final TextView        recipient;
     private final TextView        emoji;
 
-    private ViewHolder(@NonNull View itemView) {
+    public ViewHolder(@NonNull View itemView) {
       super(itemView);
 
       avatar    = itemView.findViewById(R.id.reactions_bottom_view_recipient_avatar);
@@ -61,7 +60,7 @@ final class ReactionRecipientsAdapter extends RecyclerView.Adapter<ReactionRecip
     }
 
     void bind(@NonNull Reaction reaction) {
-      this.recipient.setText(getReactionSenderDisplayName(itemView.getContext(), reaction.getSender()));
+      this.recipient.setText(reaction.getSender().getDisplayName(itemView.getContext()));
       this.emoji.setText(reaction.getEmoji());
 
       if (reaction.getSender().isLocalNumber()) {
@@ -71,16 +70,6 @@ final class ReactionRecipientsAdapter extends RecyclerView.Adapter<ReactionRecip
         this.avatar.setAvatar(GlideApp.with(avatar), reaction.getSender(), false);
       }
     }
-
-    private static @NonNull String getReactionSenderDisplayName(@NonNull Context context, @NonNull Recipient sender) {
-      String displayName = sender.getDisplayName(context);
-
-      if (sender.isLocalNumber()) {
-        return context.getString(R.string.ReactionsBottomSheetDialogFragment_you, displayName);
-      } else {
-        return displayName;
-      }
-    }
   }
 
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f819b1ed20..38747e4d52 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -669,7 +669,6 @@
 
     <!-- ReactionsBottomSheetDialogFragment -->
     <string name="ReactionsBottomSheetDialogFragment_all">All %1$d</string>
-    <string name="ReactionsBottomSheetDialogFragment_you">%1$s (You)</string>
 
     <!-- ReactionsConversationView -->
     <string name="ReactionsConversationView_plus">+%1$d</string>