From 3b17a4141590735f60728752428a9ee9eff89ba4 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 19 Apr 2022 10:18:01 -0300 Subject: [PATCH] Send actual quote author in story direct reply. --- .../securesms/messages/MessageContentProcessor.java | 2 +- .../stories/viewer/reply/direct/StoryDirectReplyRepository.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java index d6ac5bf8c..fb997d0c0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java @@ -1585,7 +1585,7 @@ public final class MessageContentProcessor { parentStoryId = new ParentStoryId.GroupReply(storyMessageId.getId()); } else if (groupStory || SignalDatabase.storySends().canReply(senderRecipient.getId(), storyContext.getSentTimestamp())) { parentStoryId = new ParentStoryId.DirectReply(storyMessageId.getId()); - quoteModel = new QuoteModel(storyContext.getSentTimestamp(), groupStory ? threadRecipient.getId() : storyAuthorRecipient, "", false, story.getSlideDeck().asAttachments(), Collections.emptyList()); + quoteModel = new QuoteModel(storyContext.getSentTimestamp(), storyAuthorRecipient, "", false, story.getSlideDeck().asAttachments(), Collections.emptyList()); expiresInMillis = TimeUnit.SECONDS.toMillis(message.getExpiresInSeconds()); } else { warn(content.getTimestamp(), "Story has replies disabled. Dropping reply."); diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyRepository.kt index 854e1f13d..6e7ff66cd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyRepository.kt @@ -37,7 +37,6 @@ class StoryDirectReplyRepository(context: Context) { } val quoteAuthor: Recipient = when { - groupDirectReplyRecipientId != null -> message.recipient message.isOutgoing -> Recipient.self() else -> message.individualRecipient }