From b183a38f3c4e6457e48a1975b66e420cf907a390 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 22 Jul 2022 14:49:59 -0300
Subject: [PATCH] Add proper thread summary for reactions to stories.

---
 .../securesms/database/ThreadBodyUtil.java             | 10 ++++++++++
 app/src/main/res/values/strings.xml                    |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadBodyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadBodyUtil.java
index 4d25c2209..1e1708364 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadBodyUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadBodyUtil.java
@@ -50,6 +50,8 @@ public final class ThreadBodyUtil {
       return format(context, record, emoji, R.string.ThreadRecord_sticker);
     } else if (MessageRecordUtil.hasGiftBadge(record)) {
       return String.format("%s %s", EmojiStrings.GIFT, getGiftSummary(context, record));
+    } else if (MessageRecordUtil.isStoryReaction(record)) {
+      return getStoryReactionSummary(context, record);
     }
 
     boolean hasImage = false;
@@ -84,6 +86,14 @@ public final class ThreadBodyUtil {
       return context.getString(R.string.ThreadRecord__you_received_a_gift);
     }
   }
+
+  private static @NonNull String getStoryReactionSummary(@NonNull Context context, @NonNull MessageRecord messageRecord) {
+    if (messageRecord.isOutgoing()) {
+      return context.getString(R.string.ThreadRecord__reacted_s_to_their_story, messageRecord.getDisplayBody(context));
+    } else {
+      return context.getString(R.string.ThreadRecord__reacted_s_to_your_story, messageRecord.getDisplayBody(context));
+    }
+  }
   
   private static @NonNull String format(@NonNull Context context, @NonNull MessageRecord record, @NonNull String emoji, @StringRes int defaultStringRes) {
     return String.format("%s %s", emoji, getBodyOrDefault(context, record, defaultStringRes));
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bc3e9ad7d..25949fa41 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1811,6 +1811,10 @@
     <string name="ThreadRecord__you_sent_a_gift">You sent a gift</string>
     <!-- Displayed in the notification when the user has opened a received gift -->
     <string name="ThreadRecord__you_redeemed_a_gift_badge">You redeemed a gift badge</string>
+    <!-- Displayed in the conversation list when someone reacted to your story -->
+    <string name="ThreadRecord__reacted_s_to_your_story">Reacted %1$s to your story</string>
+    <!-- Displayed in the conversation list when you reacted to someone's story -->
+    <string name="ThreadRecord__reacted_s_to_their_story">Reacted %1$s to their story</string>
 
     <!-- UpdateApkReadyListener -->
     <string name="UpdateApkReadyListener_Signal_update">Signal update</string>