From 2608e9165cbc2fc4261b058213807e91b469523b Mon Sep 17 00:00:00 2001
From: Jeffrey Starke <jeffrey@signal.org>
Date: Mon, 7 Apr 2025 16:00:09 -0400
Subject: [PATCH] Fix group member review avatar and "other groups in common"
 copy. (#4813)

- Fixes `ReviewBannerView` erroneously using the note to self icon instead of the current user's profile photo.
- Fixes the "other groups in common" copy, which was missing the word "other".
---
 .../securesms/profiles/spoofing/ReviewBannerView.java         | 4 ++--
 app/src/main/res/values/strings.xml                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java
index caad1944b5..fa47224a39 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java
@@ -67,8 +67,8 @@ public class ReviewBannerView extends FrameLayout {
   }
 
   public void setBannerRecipients(@NonNull Recipient target, @NonNull Recipient dupe) {
-    binding.bannerTopLeftAvatar.setAvatar(target);
-    binding.bannerBottomRightAvatar.setAvatar(dupe);
+    binding.bannerTopLeftAvatar.setAvatarUsingProfile(target);
+    binding.bannerBottomRightAvatar.setAvatarUsingProfile(dupe);
 
     binding.bannerIcon.setVisibility(GONE);
     binding.bannerTopLeftAvatar.setVisibility(VISIBLE);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 96c95fb69b..2c6eb3a1a7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4944,8 +4944,8 @@
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">No other groups in common.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">No groups in common.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
-        <item quantity="one">%d group in common</item>
-        <item quantity="other">%d groups in common</item>
+        <item quantity="one">%d other group in common</item>
+        <item quantity="other">%d other groups in common</item>
     </plurals>
     <plurals name="ReviewCardDialogFragment__d_groups_in_common">
         <item quantity="one">%d group in common</item>